Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1356de06 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Torvalds
Browse files

staging: rt2860: use new hex_to_bin() method 



Instead of using own implementation involve hex_to_bin() function.

Signed-off-by: default avatarAndy Shevchenko <ext-andriy.shevchenko@nokia.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 69e4469a

drivers/staging/rt2860/common/rtmp_init.c

+2 −13
Original line number Diff line number Diff line
@@ -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) */

/* */
@@ -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++;

	}

}

drivers/staging/rt2860/rtmp.h

+0 −2
Original line number Diff line number Diff line
@@ -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,