From patchwork Fri Jul 23 13:18:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 59784 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E39CAB70E2 for ; Fri, 23 Jul 2010 23:20:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760058Ab0GWNUL (ORCPT ); Fri, 23 Jul 2010 09:20:11 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:54478 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753569Ab0GWNSt (ORCPT ); Fri, 23 Jul 2010 09:18:49 -0400 Received: by mail-fx0-f46.google.com with SMTP id 14so5007896fxm.19 for ; Fri, 23 Jul 2010 06:18:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:in-reply-to:references; bh=eJkLchjdIWaGH0rZbMr3bdZE+14dPw187GIwPP2DvFM=; b=qcvu6LvXHd891ONkE83TNFd92L1/MQ3FN3AaIPKVw4zZvJ0k/aim9WLlEFzO4sfR8u /nbQtWelqB6F/somJxEq4rKl2dFwWmpsWLXtU7ajdXl9lKa9PhyfgMLW1ovw96h2f6M7 xMA0WmFW17zX4LRDxfCwpVStKuAFRMHsVZYcY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=N3Cm+21M+bnYuxGAcf0oATV73XINXjBNmx+YFelNriovc8OTtofxs0LVxoOdPmyhH4 4wPdrxmRZaqHR2aSzkhBooWO6ZdOiKZxLQY1qqlZ+zidGnoMhSQIH/cqiMmwUqn5g64K SLlyTXdbEzYEEBhU/wQFL4y3GWROGr7LtHsas= Received: by 10.223.122.13 with SMTP id j13mr3367633far.23.1279891127984; Fri, 23 Jul 2010 06:18:47 -0700 (PDT) Received: from localhost.localdomain (79-134-110-189.cust.suomicom.fi [79.134.110.189]) by mx.google.com with ESMTPS id q17sm86672faa.21.2010.07.23.06.18.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 23 Jul 2010 06:18:47 -0700 (PDT) From: Andy Shevchenko To: "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andy Shevchenko , Greg Kroah-Hartman , linux-usb@vger.kernel.org Subject: [PATCH 3/5] usb: usbnet: use newly introduced hex_to_bin() Date: Fri, 23 Jul 2010 16:18:08 +0300 Message-Id: X-Mailer: git-send-email 1.7.1.1 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Andy Shevchenko Cc: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org --- drivers/net/usb/usbnet.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 7eab407..f5e1639 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -44,6 +44,7 @@ #include #include #include +#include #define DRIVER_VERSION "22-Aug-2005" @@ -158,16 +159,6 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf) } EXPORT_SYMBOL_GPL(usbnet_get_endpoints); -static u8 nibble(unsigned char c) -{ - if (likely(isdigit(c))) - return c - '0'; - c = toupper(c); - if (likely(isxdigit(c))) - return 10 + c - 'A'; - return 0; -} - int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress) { int tmp, i; @@ -183,7 +174,7 @@ int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress) } for (i = tmp = 0; i < 6; i++, tmp += 2) dev->net->dev_addr [i] = - (nibble(buf [tmp]) << 4) + nibble(buf [tmp + 1]); + (hex_to_bin(buf[tmp]) << 4) + hex_to_bin(buf[tmp + 1]); return 0; } EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr);