diff options
| author | Andy Shevchenko <ext-andriy.shevchenko@nokia.com> | 2010-06-15 17:04:44 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 14:35:35 -0700 |
| commit | e644814a2ccbfe171d2fd2b9bca491ead1ae1a96 (patch) | |
| tree | 7610bc54a5e84406c23aef29ac38b2a1ad122e9e /drivers/usb/atm | |
| parent | a5cc8049ca8ec8b09b9649f32b6e37f94345ddb8 (diff) | |
| download | op-kernel-dev-e644814a2ccbfe171d2fd2b9bca491ead1ae1a96.zip op-kernel-dev-e644814a2ccbfe171d2fd2b9bca491ead1ae1a96.tar.gz | |
usb: throw away custom hex digit methods
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>
Diffstat (limited to 'drivers/usb/atm')
| -rw-r--r-- | drivers/usb/atm/ueagle-atm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c index ebae944..5b3f555 100644 --- a/drivers/usb/atm/ueagle-atm.c +++ b/drivers/usb/atm/ueagle-atm.c @@ -67,6 +67,7 @@ #include <linux/mutex.h> #include <linux/freezer.h> #include <linux/slab.h> +#include <linux/kernel.h> #include <asm/unaligned.h> @@ -2436,7 +2437,6 @@ UEA_ATTR(firmid, 0); /* 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) { 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; 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; } |
