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 08/10] fs: ldm: don't use own implementation of hex_to_bin()
    Date
    Get rid of own implementation of hex_to_bin().

    Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
    Cc: "Richard Russon (FlatCap)" <ldm@flatcap.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    ---
    fs/partitions/ldm.c | 18 +++++++++---------
    1 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
    index 8652fb9..cb445fb 100644
    --- a/fs/partitions/ldm.c
    +++ b/fs/partitions/ldm.c
    @@ -26,6 +26,7 @@
    #include <linux/slab.h>
    #include <linux/pagemap.h>
    #include <linux/stringify.h>
    +#include <linux/kernel.h>
    #include "ldm.h"
    #include "check.h"
    #include "msdos.h"
    @@ -77,17 +78,16 @@ static int ldm_parse_hexbyte (const u8 *src)
    int h;

    /* high part */
    - if ((x = src[0] - '0') <= '9'-'0') h = x;
    - else if ((x = src[0] - 'a') <= 'f'-'a') h = x+10;
    - else if ((x = src[0] - 'A') <= 'F'-'A') h = x+10;
    - else return -1;
    - h <<= 4;
    + x = h = hex_to_bin(src[0]);
    + if (h < 0)
    + return -1;

    /* low part */
    - if ((x = src[1] - '0') <= '9'-'0') return h | x;
    - if ((x = src[1] - 'a') <= 'f'-'a') return h | (x+10);
    - if ((x = src[1] - 'A') <= 'F'-'A') return h | (x+10);
    - return -1;
    + h = hex_to_bin(src[1]);
    + if (h < 0)
    + return -1;
    +
    + return (x << 4) + h;
    }

    /**
    --
    1.6.3.3


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