Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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,
         printk("\n");
 }
 
-static u8 hex_val(unsigned char c)
-{
-        return isdigit(c) ? c - '0' : toupper(c) - 'A' + 10;
-}
-
 static acpi_status acpi_str_to_uuid(char *str, u8 *uuid)
 {
         int i;
@@ -422,8 +417,8 @@ static acpi_status acpi_str_to_uuid(char *str, u8 *uuid)
                         return AE_BAD_PARAMETER;
         }
         for (i = 0; i < 16; i++) {
-                uuid[i] = hex_val(str[opc_map_to_uuid[i]]) << 4;
-                uuid[i] |= hex_val(str[opc_map_to_uuid[i] + 1]);
+                uuid[i] = hex_to_bin(str[opc_map_to_uuid[i]]) << 4;
+                uuid[i] |= hex_to_bin(str[opc_map_to_uuid[i] + 1]);
         }
         return AE_OK;
 }