Commit fd1f170d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller

usb: usbnet: use newly introduced hex_to_bin()

Signed-off-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-usb@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c4ac8c6
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/usb/usbnet.h> #include <linux/usb/usbnet.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kernel.h>
#define DRIVER_VERSION "22-Aug-2005" #define DRIVER_VERSION "22-Aug-2005"
...@@ -158,16 +159,6 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf) ...@@ -158,16 +159,6 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf)
} }
EXPORT_SYMBOL_GPL(usbnet_get_endpoints); 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 usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress)
{ {
int tmp, i; int tmp, i;
...@@ -183,7 +174,7 @@ int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress) ...@@ -183,7 +174,7 @@ int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress)
} }
for (i = tmp = 0; i < 6; i++, tmp += 2) for (i = tmp = 0; i < 6; i++, tmp += 2)
dev->net->dev_addr [i] = 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; return 0;
} }
EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr); EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment