[ACPI] ACPICA 20060113

Added 2006 copyright.

At SuSE's suggestion, enabled all error messages
without enabling function tracing, ie with CONFIG_ACPI_DEBUG=n

Replaced all instances of the ACPI_DEBUG_PRINT macro invoked at
the ACPI_DB_ERROR and ACPI_DB_WARN debug levels with
the ACPI_REPORT_ERROR and ACPI_REPORT_WARNING macros,
respectively. This preserves all error and warning messages
in the non-debug version of the ACPICA code (this has been
referred to as the "debug lite" option.) Over 200 cases
were converted to create a total of over 380 error/warning
messages across the ACPICA code. This increases the code
and data size of the default non-debug version by about 13K.
Added ACPI_NO_ERROR_MESSAGES flag to enable deleting all messages.
The size of the debug version remains about the same.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

16 files changed, 66 insertions, 88 deletions

diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index 6923059ba3c7..c2db93e25b78 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.c
@@ -5,7 +5,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
@@ -110,10 +110,7 @@ acpi_status acpi_ns_root_initialize(void)
                                         ACPI_NS_NO_UPSEARCH, NULL, &new_node);
 
                 if (ACPI_FAILURE(status) || (!new_node)) {      /* Must be on same line for code converter */
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Could not create predefined name %s, %s\n",
-                                          init_val->name,
-                                          acpi_format_exception(status)));
+                        ACPI_REPORT_ERROR(("Could not create predefined name %s, %s\n", init_val->name, acpi_format_exception(status)));
                 }
 
                 /*
@@ -124,9 +121,7 @@ acpi_status acpi_ns_root_initialize(void)
                 if (init_val->val) {
                         status = acpi_os_predefined_override(init_val, &val);
                         if (ACPI_FAILURE(status)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Could not override predefined %s\n",
-                                                  init_val->name));
+                                ACPI_REPORT_ERROR(("Could not override predefined %s\n", init_val->name));
                         }
 
                         if (!val) {
@@ -339,7 +334,10 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                 prefix_node = scope_info->scope.node;
                 if (ACPI_GET_DESCRIPTOR_TYPE(prefix_node) !=
                     ACPI_DESC_TYPE_NAMED) {
-                        ACPI_REPORT_ERROR(("ns_lookup: %p is not a namespace node [%s]\n", prefix_node, acpi_ut_get_descriptor_name(prefix_node)));
+                        ACPI_REPORT_ERROR(("%p is not a namespace node [%s]\n",
+                                           prefix_node,
+                                           acpi_ut_get_descriptor_name
+                                           (prefix_node)));
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
 
@@ -600,7 +598,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                     (this_node->type != type_to_check_for)) {
                         /* Complain about a type mismatch */
 
-                        ACPI_REPORT_WARNING(("ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)\n", (char *)&simple_name, acpi_ut_get_type_name(this_node->type), acpi_ut_get_type_name(type_to_check_for)));
+                        ACPI_REPORT_WARNING(("ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)\n", ACPI_CAST_PTR(char, &simple_name), acpi_ut_get_type_name(this_node->type), acpi_ut_get_type_name(type_to_check_for)));
                 }
 
                 /*
diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c
index cc7a85f8cfe6..3db950f5d5a0 100644
--- a/drivers/acpi/namespace/nsalloc.c
+++ b/drivers/acpi/namespace/nsalloc.c
@@ -5,7 +5,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
@@ -272,9 +272,8 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
                 /* Grandchildren should have all been deleted already */
 
                 if (child_node->child) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Found a grandchild! P=%p C=%p\n",
-                                          parent_node, child_node));
+                        ACPI_REPORT_ERROR(("Found a grandchild! P=%p C=%p\n",
+                                           parent_node, child_node));
                 }
 
                 /* Now we can free this child object */
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 864c642759fa..2f0b70e3e881 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -5,7 +5,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
@@ -198,7 +198,8 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                 /* Check the node type and name */
 
                 if (type > ACPI_TYPE_LOCAL_MAX) {
-                        ACPI_REPORT_WARNING(("Invalid ACPI Type %08X\n", type));
+                        ACPI_REPORT_WARNING(("Invalid ACPI Object Type %08X\n",
+                                             type));
                 }
 
                 if (!acpi_ut_valid_acpi_name(this_node->name.integer)) {
diff --git a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/namespace/nsdumpdv.c
index 55de883943d6..aff899a935e3 100644
--- a/drivers/acpi/namespace/nsdumpdv.c
+++ b/drivers/acpi/namespace/nsdumpdv.c
@@ -5,7 +5,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
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c
index 0191c7d92824..e3c667072e2f 100644
--- a/drivers/acpi/namespace/nseval.c
+++ b/drivers/acpi/namespace/nseval.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
@@ -373,8 +373,7 @@ acpi_ns_execute_control_method(struct acpi_parameter_info *info)
 
         info->obj_desc = acpi_ns_get_attached_object(info->node);
         if (!info->obj_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "No attached method object\n"));
+                ACPI_REPORT_ERROR(("No attached method object\n"));
 
                 (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
                 return_ACPI_STATUS(AE_NULL_OBJECT);
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index efa3f4233736..6c117893f301 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -5,7 +5,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
@@ -93,8 +93,8 @@ acpi_status acpi_ns_initialize_objects(void)
                                      ACPI_UINT32_MAX, acpi_ns_init_one_object,
                                      &info, NULL);
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed! %s\n",
-                                  acpi_format_exception(status)));
+                ACPI_REPORT_ERROR(("walk_namespace failed! %s\n",
+                                   acpi_format_exception(status)));
         }
 
         ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
@@ -159,8 +159,8 @@ acpi_status acpi_ns_initialize_devices(void)
         (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
 
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed! %s\n",
-                                  acpi_format_exception(status)));
+                ACPI_REPORT_ERROR(("walk_namespace failed! %s\n",
+                                   acpi_format_exception(status)));
         }
 
         ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
@@ -289,12 +289,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
         }
 
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_ERROR, "\n"));
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Could not execute arguments for [%4.4s] (%s), %s\n",
-                                  acpi_ut_get_node_name(node),
-                                  acpi_ut_get_type_name(type),
-                                  acpi_format_exception(status)));
+                ACPI_REPORT_ERROR(("\nCould not execute arguments for [%4.4s] (%s), %s\n", acpi_ut_get_node_name(node), acpi_ut_get_type_name(type), acpi_format_exception(status)));
         }
 
         /*
@@ -421,8 +416,9 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
 #ifdef ACPI_DEBUG_OUTPUT
                 char *scope_name = acpi_ns_get_external_pathname(ini_node);
 
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN, "%s._INI failed: %s\n",
-                                  scope_name, acpi_format_exception(status)));
+                ACPI_REPORT_WARNING(("%s._INI failed: %s\n",
+                                     scope_name,
+                                     acpi_format_exception(status)));
 
                 ACPI_MEM_FREE(scope_name);
 #endif
diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c
index c28849de465a..0b4a866ef5aa 100644
--- a/drivers/acpi/namespace/nsload.c
+++ b/drivers/acpi/namespace/nsload.c
@@ -5,7 +5,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
@@ -92,7 +92,7 @@ acpi_ns_load_table(struct acpi_table_desc *table_desc,
         /* Check validity of the AML start and length */
 
         if (!table_desc->aml_start) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null AML pointer\n"));
+                ACPI_REPORT_ERROR(("Null AML pointer\n"));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -263,7 +263,7 @@ acpi_status acpi_ns_load_namespace(void)
         /* There must be at least a DSDT installed */
 
         if (acpi_gbl_DSDT == NULL) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "DSDT is not in memory\n"));
+                ACPI_REPORT_ERROR(("DSDT is not in memory\n"));
                 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
         }
 
diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c
index 5400728eb791..411e1f8b11d0 100644
--- a/drivers/acpi/namespace/nsnames.c
+++ b/drivers/acpi/namespace/nsnames.c
@@ -5,7 +5,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
@@ -75,7 +75,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
         acpi_size index;
         struct acpi_namespace_node *parent_node;
 
-        ACPI_FUNCTION_NAME("ns_build_external_path");
+        ACPI_FUNCTION_ENTRY();
 
         /* Special case for root */
 
@@ -110,9 +110,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
         name_buffer[index] = AML_ROOT_PREFIX;
 
         if (index != 0) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Could not construct pathname; index=%X, size=%X, Path=%s\n",
-                                  (u32) index, (u32) size, &name_buffer[size]));
+                ACPI_REPORT_ERROR(("Could not construct pathname; index=%X, size=%X, Path=%s\n", (u32) index, (u32) size, &name_buffer[size]));
         }
 
         return;
@@ -148,7 +146,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
 
         name_buffer = ACPI_MEM_CALLOCATE(size);
         if (!name_buffer) {
-                ACPI_REPORT_ERROR(("ns_get_table_pathname: allocation failure\n"));
+                ACPI_REPORT_ERROR(("Allocation failure\n"));
                 return_PTR(NULL);
         }
 
diff --git a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/namespace/nsobject.c
index fc9be946ebed..86113093f7b7 100644
--- a/drivers/acpi/namespace/nsobject.c
+++ b/drivers/acpi/namespace/nsobject.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
@@ -84,21 +84,21 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
         if (!node) {
                 /* Invalid handle */
 
-                ACPI_REPORT_ERROR(("ns_attach_object: Null named_obj handle\n"));
+                ACPI_REPORT_ERROR(("Null named_obj handle\n"));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         if (!object && (ACPI_TYPE_ANY != type)) {
                 /* Null object */
 
-                ACPI_REPORT_ERROR(("ns_attach_object: Null object, but type not ACPI_TYPE_ANY\n"));
+                ACPI_REPORT_ERROR(("Null object, but type not ACPI_TYPE_ANY\n"));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) {
                 /* Not a name handle */
 
-                ACPI_REPORT_ERROR(("ns_attach_object: Invalid handle %p [%s]\n",
+                ACPI_REPORT_ERROR(("Invalid handle %p [%s]\n",
                                    node, acpi_ut_get_descriptor_name(node)));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
@@ -254,7 +254,7 @@ union acpi_operand_object *acpi_ns_get_attached_object(struct
         ACPI_FUNCTION_TRACE_PTR("ns_get_attached_object", node);
 
         if (!node) {
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Null Node ptr\n"));
+                ACPI_REPORT_WARNING(("Null Node ptr\n"));
                 return_PTR(NULL);
         }
 
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c
index 433442a9ec74..232be4303653 100644
--- a/drivers/acpi/namespace/nsparse.c
+++ b/drivers/acpi/namespace/nsparse.c
@@ -5,7 +5,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
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index c1b1943d4670..f094a2eb8512 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.c
@@ -5,7 +5,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
@@ -298,18 +298,15 @@ acpi_ns_search_and_enter(u32 target_name,
         /* Parameter validation */
 
         if (!node || !target_name || !return_node) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Null param: Node %p Name %X return_node %p\n",
-                                  node, target_name, return_node));
-
-                ACPI_REPORT_ERROR(("ns_search_and_enter: Null parameter\n"));
+                ACPI_REPORT_ERROR(("Null param: Node %p Name %X return_node %p\n", node, target_name, return_node));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         /* Name must consist of printable characters */
 
         if (!acpi_ut_valid_acpi_name(target_name)) {
-                ACPI_REPORT_ERROR(("ns_search_and_enter: Bad character in ACPI Name: %X\n", target_name));
+                ACPI_REPORT_ERROR(("Bad character in ACPI Name: %X\n",
+                                   target_name));
                 return_ACPI_STATUS(AE_BAD_CHARACTER);
         }
 
diff --git a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/namespace/nsutils.c
index 549075fb9f88..bc779fdd3caf 100644
--- a/drivers/acpi/namespace/nsutils.c
+++ b/drivers/acpi/namespace/nsutils.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
@@ -63,7 +63,6 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);
  *
  * PARAMETERS:  module_name         - Caller's module name (for error output)
  *              line_number         - Caller's line number (for error output)
- *              component_id        - Caller's component ID (for error output)
  *              internal_name       - Name or path of the namespace node
  *              lookup_status       - Exception code from NS lookup
  *
@@ -76,14 +75,12 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);
 void
 acpi_ns_report_error(char *module_name,
                      u32 line_number,
-                     u32 component_id,
                      char *internal_name, acpi_status lookup_status)
 {
         acpi_status status;
         char *name = NULL;
 
-        acpi_os_printf("%8s-%04d: *** Error: Looking up ",
-                       module_name, line_number);
+        acpi_ut_report_error(module_name, line_number);
 
         if (lookup_status == AE_BAD_CHARACTER) {
                 /* There is a non-ascii character in the name */
@@ -109,7 +106,7 @@ acpi_ns_report_error(char *module_name,
                 }
         }
 
-        acpi_os_printf(" in namespace, %s\n",
+        acpi_os_printf("Namespace lookup failure, %s\n",
                        acpi_format_exception(lookup_status));
 }
 
@@ -119,10 +116,9 @@ acpi_ns_report_error(char *module_name,
  *
  * PARAMETERS:  module_name         - Caller's module name (for error output)
  *              line_number         - Caller's line number (for error output)
- *              component_id        - Caller's component ID (for error output)
  *              Message             - Error message to use on failure
  *              prefix_node         - Prefix relative to the path
- *              Path                - Path to the node
+ *              Path                - Path to the node (optional)
  *              method_status       - Execution status
  *
  * RETURN:      None
@@ -134,7 +130,6 @@ acpi_ns_report_error(char *module_name,
 void
 acpi_ns_report_method_error(char *module_name,
                             u32 line_number,
-                            u32 component_id,
                             char *message,
                             struct acpi_namespace_node *prefix_node,
                             char *path, acpi_status method_status)
@@ -142,17 +137,16 @@ acpi_ns_report_method_error(char *module_name,
         acpi_status status;
         struct acpi_namespace_node *node = prefix_node;
 
+        acpi_ut_report_error(module_name, line_number);
+
         if (path) {
                 status = acpi_ns_get_node_by_path(path, prefix_node,
                                                   ACPI_NS_NO_UPSEARCH, &node);
                 if (ACPI_FAILURE(status)) {
-                        acpi_os_printf
-                            ("report_method_error: Could not get node\n");
-                        return;
+                        acpi_os_printf("[Could not get node by pathname]");
                 }
         }
 
-        acpi_os_printf("%8s-%04d: *** Error: ", module_name, line_number);
         acpi_ns_print_node_pathname(node, message);
         acpi_os_printf(", %s\n", acpi_format_exception(method_status));
 }
@@ -248,7 +242,7 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)
         ACPI_FUNCTION_TRACE("ns_get_type");
 
         if (!node) {
-                ACPI_REPORT_WARNING(("ns_get_type: Null Node input pointer\n"));
+                ACPI_REPORT_WARNING(("Null Node parameter\n"));
                 return_UINT32(ACPI_TYPE_ANY);
         }
 
@@ -275,7 +269,7 @@ u32 acpi_ns_local(acpi_object_type type)
         if (!acpi_ut_valid_object_type(type)) {
                 /* Type code out of range  */
 
-                ACPI_REPORT_WARNING(("ns_local: Invalid Object Type\n"));
+                ACPI_REPORT_WARNING(("Invalid Object Type %X\n", type));
                 return_UINT32(ACPI_NS_NORMAL);
         }
 
@@ -627,7 +621,7 @@ acpi_ns_externalize_name(u32 internal_name_length,
          * with internal_name (invalid format).
          */
         if (required_length > internal_name_length) {
-                ACPI_REPORT_ERROR(("ns_externalize_name: Invalid internal name\n"));
+                ACPI_REPORT_ERROR(("Invalid internal name\n"));
                 return_ACPI_STATUS(AE_BAD_PATHNAME);
         }
 
@@ -803,8 +797,7 @@ u32 acpi_ns_opens_scope(acpi_object_type type)
         if (!acpi_ut_valid_object_type(type)) {
                 /* type code out of range  */
 
-                ACPI_REPORT_WARNING(("ns_opens_scope: Invalid Object Type %X\n",
-                                     type));
+                ACPI_REPORT_WARNING(("Invalid Object Type %X\n", type));
                 return_UINT32(ACPI_NS_NORMAL);
         }
 
diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c
index 5f164c0df33b..fcab1e784b81 100644
--- a/drivers/acpi/namespace/nswalk.c
+++ b/drivers/acpi/namespace/nswalk.c
@@ -5,7 +5,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
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index 75b137a6a3c9..de13add43efc 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.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
@@ -112,8 +112,7 @@ acpi_evaluate_object_typed(acpi_handle handle,
         if (return_buffer->length == 0) {
                 /* Error because caller specifically asked for a return value */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "No return value\n"));
-
+                ACPI_REPORT_ERROR(("No return value\n"));
                 return_ACPI_STATUS(AE_NULL_OBJECT);
         }
 
@@ -125,11 +124,11 @@ acpi_evaluate_object_typed(acpi_handle handle,
 
         /* Return object type does not match requested type */
 
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                          "Incorrect return type [%s] requested [%s]\n",
-                          acpi_ut_get_type_name(((union acpi_object *)
-                                                 return_buffer->pointer)->type),
-                          acpi_ut_get_type_name(return_type)));
+        ACPI_REPORT_ERROR(("Incorrect return type [%s] requested [%s]\n",
+                           acpi_ut_get_type_name(((union acpi_object *)
+                                                  return_buffer->pointer)->
+                                                 type),
+                           acpi_ut_get_type_name(return_type)));
 
         if (must_free) {
                 /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */
@@ -236,11 +235,9 @@ acpi_evaluate_object(acpi_handle handle,
                  * qualified names above, this is an error
                  */
                 if (!pathname) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Both Handle and Pathname are NULL\n"));
+                        ACPI_REPORT_ERROR(("Both Handle and Pathname are NULL\n"));
                 } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Handle is NULL and Pathname is relative\n"));
+                        ACPI_REPORT_ERROR(("Handle is NULL and Pathname is relative\n"));
                 }
 
                 status = AE_BAD_PARAMETER;
diff --git a/drivers/acpi/namespace/nsxfname.c b/drivers/acpi/namespace/nsxfname.c
index 6b5f8d4481d1..853e6d170c96 100644
--- a/drivers/acpi/namespace/nsxfname.c
+++ b/drivers/acpi/namespace/nsxfname.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
diff --git a/drivers/acpi/namespace/nsxfobj.c b/drivers/acpi/namespace/nsxfobj.c
index 0856d42e6909..a0332595677a 100644
--- a/drivers/acpi/namespace/nsxfobj.c
+++ b/drivers/acpi/namespace/nsxfobj.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