From b81a032a8326bf595a3d38bcc8098c5702cd5734 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Date: Tue, 15 Jun 2010 17:25:38 +0300
Subject: [PATCH] --- yaml --- r: 205715 b: refs/heads/master c:
 3ff16c257a103febb63a92f305043fc36c83e9ad h: refs/heads/master i:   205713:
 76b9b167aa3b9a127cae1d78f1d9776e716622a4   205711:
 13421aa3b621aba8322aef910bec3a687f3ce7c7 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/staging/comedi/drivers/jr3_pci.c  | 17 +++++++++--------
 .../drivers/staging/rtl8192su/r8192S_Efuse.c  | 19 +------------------
 3 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 3c67cfdbba81..018f34fb2fdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 600cec3ed0a08f62712c6d3c5fea2fcb8b7e3675
+refs/heads/master: 3ff16c257a103febb63a92f305043fc36c83e9ad
diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.c b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
index ba900a80a470..8b383ee959b2 100644
--- a/trunk/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/trunk/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/trunk/drivers/staging/rtl8192su/r8192S_Efuse.c b/trunk/drivers/staging/rtl8192su/r8192S_Efuse.c
index f0ce6562c23b..1e1d55eb70e4 100644
--- a/trunk/drivers/staging/rtl8192su/r8192S_Efuse.c
+++ b/trunk/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)++;