openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Andy Shevchenko 2010-06-15 17:25:38 +03:00 committed by Greg Kroah-Hartman
parent 600cec3ed0
commit 3ff16c257a
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/comedi/drivers/jr3_pci.c
View File

@ -48,6 +48,7 @@ Devices: [JR3] PCI force sensor board (jr3_pci)
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/kernel.h>
#include "comedi_pci.h" #include "comedi_pci.h"
#include "jr3_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 */ /* Collect value */
*val = 0; *val = 0;
for (; *pos < size && isxdigit(data[*pos]); (*pos)++) { for (; *pos < size; (*pos)++) {
char ch = tolower(data[*pos]); int value;
value = hex_to_bin(data[*pos]);
if (value >= 0) {
result = 1; result = 1;
if ('0' <= ch && ch <= '9') { *val = (*val << 4) + value;
*val = (*val << 4) + (ch - '0'); } else
} else if ('a' <= ch && ch <= 'f') { break;
*val = (*val << 4) + (ch - 'a' + 10);
}
} }
} }
return result; return result;

19
drivers/staging/rtl8192su/r8192S_Efuse.c
View File

@ -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 * Function: efuse_ParsingMap
* *
@ -1917,8 +1901,7 @@ efuse_ParsingMap(char* szStr,u32* pu4bVal,u32* pu4bMove)
// Parse each digit. // Parse each digit.
do do
{ {
(*pu4bVal) <<= 4; *pu4bVal = (*pu4bVal << 4) + hex_to_bin(*szScan);
*pu4bVal += MapCharToHexDigit(*szScan);
szScan++; szScan++;
(*pu4bMove)++; (*pu4bMove)++;