]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: rtl8712: throw away custom hex_to_bin()
authorAndy Shevchenko <andy.shevchenko@gmail.com>
Tue, 7 Sep 2010 15:20:21 +0000 (18:20 +0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 8 Sep 2010 08:59:53 +0000 (01:59 -0700)
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/rtl8712/rtl871x_ioctl_linux.c

index 1529239bac686f792af1dfe88251e2b3ab7891cf..eac049b12d535398e6010f77d90bbb74fe135b35 100644 (file)
@@ -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;