lkml.org 
[lkml]   [2010]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/10] staging: rt2860: use new hex_to_bin() method
    Date
    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>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    ---
    drivers/staging/rt2860/common/rtmp_init.c | 15 ++-------------
    drivers/staging/rt2860/rtmp.h | 2 --
    2 files changed, 2 insertions(+), 15 deletions(-)

    diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c
    index 21a95ff..a090385 100644
    --- a/drivers/staging/rt2860/common/rtmp_init.c
    +++ b/drivers/staging/rt2860/common/rtmp_init.c
    @@ -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++;
    }
    }
    diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
    index 4401a55..73bf325 100644
    --- a/drivers/staging/rt2860/rtmp.h
    +++ b/drivers/staging/rt2860/rtmp.h
    @@ -2367,8 +2367,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,
    --
    1.6.3.3


    \
     
     \ /
      Last update: 2010-04-30 19:21    [W:0.020 / U:1.144 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site