aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorAndy Shevchenko <ext-andriy.shevchenko@nokia.com>2010-05-24 17:33:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 11:07:06 -0400
commit965fd9e9a2d6d0a2704815e4579008a9f65282a0 (patch)
tree221129eef9114c022ccbd397d2519130cc776439 /drivers/acpi
parent26355387c21accb0919d34ee59478c23b2030ee5 (diff)
drivers: acpi: don't use own implementation of hex_to_bin()
Remove own implementation of hex_to_bin(). Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com> Cc: Len Brown <lenb@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/bus.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 9042a8579668..c1d23cd71652 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -401,11 +401,6 @@ static void acpi_print_osc_error(acpi_handle handle,
401 printk("\n"); 401 printk("\n");
402} 402}
403 403
404static u8 hex_val(unsigned char c)
405{
406 return isdigit(c) ? c - '0' : toupper(c) - 'A' + 10;
407}
408
409static acpi_status acpi_str_to_uuid(char *str, u8 *uuid) 404static acpi_status acpi_str_to_uuid(char *str, u8 *uuid)
410{ 405{
411 int i; 406 int i;
@@ -422,8 +417,8 @@ static acpi_status acpi_str_to_uuid(char *str, u8 *uuid)
422 return AE_BAD_PARAMETER; 417 return AE_BAD_PARAMETER;
423 } 418 }
424 for (i = 0; i < 16; i++) { 419 for (i = 0; i < 16; i++) {
425 uuid[i] = hex_val(str[opc_map_to_uuid[i]]) << 4; 420 uuid[i] = hex_to_bin(str[opc_map_to_uuid[i]]) << 4;
426 uuid[i] |= hex_val(str[opc_map_to_uuid[i] + 1]); 421 uuid[i] |= hex_to_bin(str[opc_map_to_uuid[i] + 1]);
427 } 422 }
428 return AE_OK; 423 return AE_OK;
429} 424}