Staging: don't use custom hex_to_bin() implementation

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index ba900a80a470c98cba2c3fd23ef4808cbac973c3..8b383ee959b28199d377a5739d76459037089688 100644 (file)
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -48,6 +48,7 @@ Devices: [JR3] PCI force sensor board (jr3_pci)
 #include <linux/jiffies.h>
 #include <linux/slab.h>
 #include <linux/timer.h>
+#include <linux/kernel.h>
 #include "comedi_pci.h"
 #include "jr3_pci.h"
 
@@ -397,14 +398,14 @@ int read_idm_word(const u8 * data, size_t size, int *pos, unsigned int *val)
                }
                /*  Collect value */
                *val = 0;
-               for (; *pos < size && isxdigit(data[*pos]); (*pos)++) {
-                       char ch = tolower(data[*pos]);
-                       result = 1;
-                       if ('0' <= ch && ch <= '9') {
-                               *val = (*val << 4) + (ch - '0');
-                       } else if ('a' <= ch && ch <= 'f') {
-                               *val = (*val << 4) + (ch - 'a' + 10);
-                       }
+               for (; *pos < size; (*pos)++) {
+                       int value;
+                       value = hex_to_bin(data[*pos]);
+                       if (value >= 0) {
+                               result = 1;
+                               *val = (*val << 4) + value;
+                       } else
+                               break;
                }
        }
        return result;

diff --git a/drivers/staging/rtl8192su/r8192S_Efuse.c b/drivers/staging/rtl8192su/r8192S_Efuse.c
index f0ce6562c23bc376519246aa17cf34750c9adca0..1e1d55eb70e498bc350ca312355548bd1359e67c 100644 (file)
--- a/drivers/staging/rtl8192su/r8192S_Efuse.c
+++ b/drivers/staging/rtl8192su/r8192S_Efuse.c
@@ -1848,22 +1848,6 @@ bool IsHexDigit( char chTmp)
        }
 }
 
-//
-//     Description:
-//             Translate a character to hex digit.
-//
-u32 MapCharToHexDigit(char chTmp)
-{
-       if(chTmp >= '0' && chTmp <= '9')
-               return (chTmp - '0');
-       else if(chTmp >= 'a' && chTmp <= 'f')
-               return (10 + (chTmp - 'a'));
-       else if(chTmp >= 'A' && chTmp <= 'F')
-               return (10 + (chTmp - 'A'));
-       else
-               return 0;
-}
-
 /*-----------------------------------------------------------------------------
  * Function:   efuse_ParsingMap
  *
@@ -1917,8 +1901,7 @@ efuse_ParsingMap(char* szStr,u32* pu4bVal,u32* pu4bMove)
        // Parse each digit.
        do
        {
-               (*pu4bVal) <<= 4;
-               *pu4bVal += MapCharToHexDigit(*szScan);
+               *pu4bVal = (*pu4bVal << 4) + hex_to_bin(*szScan);
 
                szScan++;
                (*pu4bMove)++;