drivers: usb: throw away custom methods
Subsystems (3)
PATCH 1/1 drivers: usb: throw away custom methods
From: Andy Shevchenko <[email protected]>
Recent kernel has common method to convert hex digit to its value.
Signed-off-by Andy Shevchenko <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc David Brownell <[email protected]>
--- drivers/usb/atm/ueagle-atm.c | 5 +++-- drivers/usb/gadget/u_ether.c | 15 ++------------- 2 files changed, 5 insertions(+), 15 deletions(-)
drivers/usb/atm/ueagle-atm.c +3 -2
@@ -67,6 +67,7 @@#include <linux/mutex.h> #include <linux/freezer.h> #include <linux/slab.h> +#include <linux/kernel.h> #include <asm/unaligned.h>
@@ -2429,7 +2430,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 ];
@@ -2440,7 +2440,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 ; }
drivers/usb/gadget/u_ether.c +2 -13
@@ -704,17 +704,6 @@ static char *host_addr;module_param (host_addr, charp,S_IRUGO );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) {if (str) {
@@ -725,8 +714,8 @@ static int get_ether_addr(const char *str, u8 *dev_addr)if ((*str =='.' ) || (*str ==':' )) str++; - num =nibble (*str++) <<4 ; - num |= (nibble (*str++)); + num =hex_to_bin (*str++) <<4 ; + num |=hex_to_bin (*str++); dev_addr [i] = num; }if (is_valid_ether_addr (dev_addr))
Signature · 1 line
1.6.6.1