lkml.org 
[lkml]   [2010]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/12] usb: atm: speedtch: use new hex_to_bin() method
    Date
    From: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>

    Instead of using own implementation which potentialy has bugs involve
    hex_to_bin() function. It requires to have hex_to_bin() implementation
    introduced by one of previous path in series.

    Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
    ---
    drivers/usb/atm/speedtch.c | 5 ++---
    1 files changed, 2 insertions(+), 3 deletions(-)
    diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
    index 3e86240..dd1c562 100644
    --- a/drivers/usb/atm/speedtch.c
    +++ b/drivers/usb/atm/speedtch.c
    @@ -128,8 +128,6 @@ MODULE_PARM_DESC(ModemOption, "default: 0x10,0x00,0x00,0x00,0x20");
    #define ENDPOINT_ISOC_DATA 0x07
    #define ENDPOINT_FIRMWARE 0x05

    -#define hex2int(c) ( (c >= '0') && (c <= '9') ? (c - '0') : ((c & 0xf) + 9) )
    -
    struct speedtch_params {
    unsigned int altsetting;
    unsigned int BMaxDSL;
    @@ -670,7 +668,8 @@ static int speedtch_atm_start(struct usbatm_data *usbatm, struct atm_dev *atm_de
    memset(atm_dev->esi, 0, sizeof(atm_dev->esi));
    if (usb_string(usb_dev, usb_dev->descriptor.iSerialNumber, mac_str, sizeof(mac_str)) == 12) {
    for (i = 0; i < 6; i++)
    - atm_dev->esi[i] = (hex2int(mac_str[i * 2]) * 16) + (hex2int(mac_str[i * 2 + 1]));
    + atm_dev->esi[i] = (hex_to_bin(mac_str[i*2]) << 4) +
    + hex_to_bin(mac_str[i*2+1]);
    }

    /* Start modem synchronisation */
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2010-02-18 20:01    [from the cache]
    ©2003-2011 Jasper Spaans