Skip to content

Commit

Permalink
staging: rt2860: use new hex_to_bin() method
Browse files Browse the repository at this point in the history
Instead of using own implementation involve hex_to_bin() function.

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Andy Shevchenko authored and Linus Torvalds committed May 25, 2010
1 parent 69e4469 commit 1356de0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
15 changes: 2 additions & 13 deletions drivers/staging/rt2860/common/rtmp_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -2810,17 +2810,6 @@ void UserCfgInit(struct rt_rtmp_adapter *pAd)
}

/* IRQL = PASSIVE_LEVEL */
u8 BtoH(char ch)
{
if (ch >= '0' && ch <= '9')
return (ch - '0'); /* Handle numerals */
if (ch >= 'A' && ch <= 'F')
return (ch - 'A' + 0xA); /* Handle capitol hex digits */
if (ch >= 'a' && ch <= 'f')
return (ch - 'a' + 0xA); /* Handle small hex digits */
return (255);
}

/* */
/* FUNCTION: AtoH(char *, u8 *, int) */
/* */
Expand All @@ -2847,8 +2836,8 @@ void AtoH(char *src, u8 *dest, int destlen)
destTemp = (u8 *)dest;

while (destlen--) {
*destTemp = BtoH(*srcptr++) << 4; /* Put 1st ascii byte in upper nibble. */
*destTemp += BtoH(*srcptr++); /* Add 2nd ascii byte to above. */
*destTemp = hex_to_bin(*srcptr++) << 4; /* Put 1st ascii byte in upper nibble. */
*destTemp += hex_to_bin(*srcptr++); /* Add 2nd ascii byte to above. */
destTemp++;
}
}
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/rt2860/rtmp.h
Original file line number Diff line number Diff line change
Expand Up @@ -2356,8 +2356,6 @@ void RTMPMoveMemory(void *pDest, void *pSrc, unsigned long Length);

void AtoH(char *src, u8 *dest, int destlen);

u8 BtoH(char ch);

void RTMPPatchMacBbpBug(struct rt_rtmp_adapter *pAd);

void RTMPInitTimer(struct rt_rtmp_adapter *pAd,
Expand Down

0 comments on commit 1356de0

Please sign in to comment.