From 91facdbe5075fdbc97a91b03855441eb5347cbc5 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Tue, 7 Sep 2010 18:20:21 +0300 Subject: [PATCH] staging: rtl8712: throw away custom hex_to_bin() Signed-off-by: Andy Shevchenko Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c index 1529239..eac049b 100644 --- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c +++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c @@ -62,17 +62,6 @@ static const char * const iw_operation_mode[] = { "Monitor" }; -static int hex2num_i(char c) -{ - if (c >= '0' && c <= '9') - return c - '0'; - if (c >= 'a' && c <= 'f') - return c - 'a' + 10; - if (c >= 'A' && c <= 'F') - return c - 'A' + 10; - return -1; -} - /** * hwaddr_aton - Convert ASCII string to MAC address * @txt: MAC address as a string (e.g., "00:11:22:33:44:55") @@ -86,10 +75,10 @@ static int hwaddr_aton_i(const char *txt, u8 *addr) for (i = 0; i < 6; i++) { int a, b; - a = hex2num_i(*txt++); + a = hex_to_bin(*txt++); if (a < 0) return -1; - b = hex2num_i(*txt++); + b = hex_to_bin(*txt++); if (b < 0) return -1; *addr++ = (a << 4) | b; -- 2.7.4