leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: throw away custom hex digit methods

Browse Source 
Recent kernel has common method to convert hex digit to its value.

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Andy Shevchenko
2010-06-15 17:04:44 +03:00
committed by Greg Kroah-Hartman
parent a5cc8049ca
commit e644814a2c
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usb/atm/ueagle-atm.c
View File

@@ -67,6 +67,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/freezer.h> #include <linux/freezer.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kernel.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
@@ -2436,7 +2437,6 @@ UEA_ATTR(firmid, 0);
/* Retrieve the device End System Identifier (MAC) */ /* Retrieve the device End System Identifier (MAC) */
#define htoi(x) (isdigit(x) ? x-'0' : toupper(x)-'A'+10)
static int uea_getesi(struct uea_softc *sc, u_char * esi) static int uea_getesi(struct uea_softc *sc, u_char * esi)
{ {
unsigned char mac_str[2 * ETH_ALEN + 1]; unsigned char mac_str[2 * ETH_ALEN + 1];
@@ -2447,7 +2447,8 @@ static int uea_getesi(struct uea_softc *sc, u_char * esi)
return 1; return 1;
for (i = 0; i < ETH_ALEN; i++) for (i = 0; i < ETH_ALEN; i++)
esi[i] = htoi(mac_str[2 * i]) * 16 + htoi(mac_str[2 * i + 1]); esi[i] = hex_to_bin(mac_str[2 * i]) * 16 +
hex_to_bin(mac_str[2 * i + 1]);
return 0; return 0;
} }

15
drivers/usb/gadget/u_ether.c
View File

@@ -704,17 +704,6 @@ static char *host_addr;
module_param(host_addr, charp, S_IRUGO); module_param(host_addr, charp, S_IRUGO);
MODULE_PARM_DESC(host_addr, "Host Ethernet Address"); MODULE_PARM_DESC(host_addr, "Host Ethernet Address");
static u8 __init nibble(unsigned char c)
{
if (isdigit(c))
return c - '0';
c = toupper(c);
if (isxdigit(c))
return 10 + c - 'A';
return 0;
}
static int get_ether_addr(const char *str, u8 *dev_addr) static int get_ether_addr(const char *str, u8 *dev_addr)
{ {
if (str) { if (str) {
@@ -725,8 +714,8 @@ static int get_ether_addr(const char *str, u8 *dev_addr)
if ((*str == '.') || (*str == ':')) if ((*str == '.') || (*str == ':'))
str++; str++;
num = nibble(*str++) << 4; num = hex_to_bin(*str++) << 4;
num |= (nibble(*str++)); num |= hex_to_bin(*str++);
dev_addr [i] = num; dev_addr [i] = num;
} }
if (is_valid_ether_addr(dev_addr)) if (is_valid_ether_addr(dev_addr))