redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

V4L/DVB: media: video: pvrusb2: remove custom hex_to_bin()

Browse source 
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>
This commit is contained in:
Andy Shevchenko 2010-07-27 09:32:50 -03:00 committed by Mauro Carvalho Chehab
parent af5458b91f
commit e03b9843dc
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/media/video/pvrusb2/pvrusb2-debugifc.c
View file

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