Merge branch 'master'

[powerpc.git] / drivers / acpi / executer / exnames.c

diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c
index 7bb5e17..054fe5e 100644 (file)
--- a/drivers/acpi/executer/exnames.c
+++ b/drivers/acpi/executer/exnames.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -99,7 +99,8 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
         */
        name_string = ACPI_MEM_ALLOCATE(size_needed);
        if (!name_string) {
-               ACPI_REPORT_ERROR(("ex_allocate_name_string: Could not allocate size %d\n", size_needed));
+               ACPI_ERROR((AE_INFO,
+                           "Could not allocate size %d", size_needed));
                return_PTR(NULL);
        }
 
@@ -167,8 +168,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
        char_buf[0] = *aml_address;
 
        if ('0' <= char_buf[0] && char_buf[0] <= '9') {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "leading digit: %c\n",
-                                 char_buf[0]));
+               ACPI_ERROR((AE_INFO, "Invalid leading digit: %c", char_buf[0]));
                return_ACPI_STATUS(AE_CTRL_PENDING);
        }
 
@@ -211,9 +211,9 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
                 * the required 4
                 */
                status = AE_AML_BAD_NAME;
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Bad character %02x in name, at %p\n",
-                                 *aml_address, aml_address));
+               ACPI_ERROR((AE_INFO,
+                           "Bad character %02x in name, at %p",
+                           *aml_address, aml_address));
        }
 
        *in_aml_address = ACPI_CAST_PTR(u8, aml_address);
@@ -412,8 +412,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
        if (AE_CTRL_PENDING == status && has_prefix) {
                /* Ran out of segments after processing a prefix */
 
-               ACPI_REPORT_ERROR(("ex_do_name: Malformed Name at %p\n",
-                                  name_string));
+               ACPI_ERROR((AE_INFO, "Malformed Name at %p", name_string));
                status = AE_AML_BAD_NAME;
        }