]> git.karo-electronics.de Git - linux-beck.git/commitdiff
V4L/DVB: media: video: pvrusb2: remove custom hex_to_bin()
authorAndy Shevchenko <andy.shevchenko@gmail.com>
Tue, 27 Jul 2010 12:32:50 +0000 (09:32 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 9 Aug 2010 02:43:06 +0000 (23:43 -0300)
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/pvrusb2/pvrusb2-debugifc.c

index e9b11e119f629f72c001945c39b6f77c38b47798..4279ebb811a11b90329c041cbc020863f54967dc 100644 (file)
@@ -94,8 +94,6 @@ static int debugifc_parse_unsigned_number(const char *buf,unsigned int count,
                                          u32 *num_ptr)
 {
        u32 result = 0;
-       u32 val;
-       int ch;
        int radix = 10;
        if ((count >= 2) && (buf[0] == '0') &&
            ((buf[1] == 'x') || (buf[1] == 'X'))) {
@@ -107,17 +105,9 @@ static int debugifc_parse_unsigned_number(const char *buf,unsigned int count,
        }
 
        while (count--) {
-               ch = *buf++;
-               if ((ch >= '0') && (ch <= '9')) {
-                       val = ch - '0';
-               } else if ((ch >= 'a') && (ch <= 'f')) {
-                       val = ch - 'a' + 10;
-               } else if ((ch >= 'A') && (ch <= 'F')) {
-                       val = ch - 'A' + 10;
-               } else {
+               int val = hex_to_bin(*buf++);
+               if (val < 0 || val >= radix)
                        return -EINVAL;
-               }
-               if (val >= radix) return -EINVAL;
                result *= radix;
                result += val;
        }