15 files changed, 84 insertions, 124 deletions

diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index b11b7ed788c6..0efcbdf7e620 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.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
@@ -301,7 +301,7 @@ void *acpi_ut_allocate(acpi_size size, u32 component, char *module, u32 line)
         /* Check for an inadvertent size of zero bytes */
 
         if (!size) {
-                _ACPI_REPORT_ERROR(module, line, component,
+                _ACPI_REPORT_ERROR(module, line,
                                    ("ut_allocate: Attempt to allocate zero bytes, allocating 1 byte\n"));
                 size = 1;
         }
@@ -310,7 +310,7 @@ void *acpi_ut_allocate(acpi_size size, u32 component, char *module, u32 line)
         if (!allocation) {
                 /* Report allocation error */
 
-                _ACPI_REPORT_ERROR(module, line, component,
+                _ACPI_REPORT_ERROR(module, line,
                                    ("ut_allocate: Could not allocate size %X\n",
                                     (u32) size));
 
@@ -344,7 +344,7 @@ void *acpi_ut_callocate(acpi_size size, u32 component, char *module, u32 line)
         /* Check for an inadvertent size of zero bytes */
 
         if (!size) {
-                _ACPI_REPORT_ERROR(module, line, component,
+                _ACPI_REPORT_ERROR(module, line,
                                    ("ut_callocate: Attempt to allocate zero bytes, allocating 1 byte\n"));
                 size = 1;
         }
@@ -353,7 +353,7 @@ void *acpi_ut_callocate(acpi_size size, u32 component, char *module, u32 line)
         if (!allocation) {
                 /* Report allocation error */
 
-                _ACPI_REPORT_ERROR(module, line, component,
+                _ACPI_REPORT_ERROR(module, line,
                                    ("ut_callocate: Could not allocate size %X\n",
                                     (u32) size));
                 return_PTR(NULL);
@@ -480,7 +480,7 @@ void *acpi_ut_callocate_and_track(acpi_size size,
         if (!allocation) {
                 /* Report allocation error */
 
-                _ACPI_REPORT_ERROR(module, line, component,
+                _ACPI_REPORT_ERROR(module, line,
                                    ("ut_callocate: Could not allocate size %X\n",
                                     (u32) size));
                 return (NULL);
@@ -524,7 +524,7 @@ acpi_ut_free_and_track(void *allocation, u32 component, char *module, u32 line)
         ACPI_FUNCTION_TRACE_PTR("ut_free", allocation);
 
         if (NULL == allocation) {
-                _ACPI_REPORT_ERROR(module, line, component,
+                _ACPI_REPORT_ERROR(module, line,
                                    ("acpi_ut_free: Attempt to delete a NULL address\n"));
 
                 return_VOID;
@@ -540,8 +540,8 @@ acpi_ut_free_and_track(void *allocation, u32 component, char *module, u32 line)
         status = acpi_ut_remove_allocation(debug_block,
                                            component, module, line);
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Could not free memory, %s\n",
-                                  acpi_format_exception(status)));
+                ACPI_REPORT_ERROR(("Could not free memory, %s\n",
+                                   acpi_format_exception(status)));
         }
 
         acpi_os_free(debug_block);
@@ -626,8 +626,8 @@ acpi_ut_track_allocation(struct acpi_debug_mem_block *allocation,
         if (element) {
                 ACPI_REPORT_ERROR(("ut_track_allocation: Allocation already present in list! (%p)\n", allocation));
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Element %p Address %p\n",
-                                  element, allocation));
+                ACPI_REPORT_ERROR(("Element %p Address %p\n",
+                                   element, allocation));
 
                 goto unlock_and_exit;
         }
@@ -687,7 +687,7 @@ acpi_ut_remove_allocation(struct acpi_debug_mem_block *allocation,
         if (NULL == mem_list->list_head) {
                 /* No allocations! */
 
-                _ACPI_REPORT_ERROR(module, line, component,
+                _ACPI_REPORT_ERROR(module, line,
                                    ("ut_remove_allocation: Empty allocation list, nothing to free!\n"));
 
                 return_ACPI_STATUS(AE_OK);
@@ -863,12 +863,10 @@ void acpi_ut_dump_allocations(u32 component, char *module)
         /* Print summary */
 
         if (!num_outstanding) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "No outstanding allocations\n"));
+                ACPI_REPORT_INFO(("No outstanding allocations\n"));
         } else {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "%d(%X) Outstanding allocations\n",
-                                  num_outstanding, num_outstanding));
+                ACPI_REPORT_ERROR(("%d(%X) Outstanding allocations\n",
+                                   num_outstanding, num_outstanding));
         }
 
         return_VOID;
diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c
index 93d48681d276..2177cb1ef2c4 100644
--- a/drivers/acpi/utilities/utcache.c
+++ b/drivers/acpi/utilities/utcache.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/utilities/utcopy.c b/drivers/acpi/utilities/utcopy.c
index 568df9e42f89..1a4da006822a 100644
--- a/drivers/acpi/utilities/utcopy.c
+++ b/drivers/acpi/utilities/utcopy.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
@@ -606,8 +606,7 @@ acpi_ut_copy_eobject_to_iobject(union acpi_object *external_object,
                 /*
                  * Packages as external input to control methods are not supported,
                  */
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Packages as parameters not implemented!\n"));
+                ACPI_REPORT_ERROR(("Packages as parameters not implemented!\n"));
 
                 return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
         }
@@ -870,7 +869,7 @@ acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj,
                                                          count +
                                                          1) * sizeof(void *));
         if (!dest_obj->package.elements) {
-                ACPI_REPORT_ERROR(("aml_build_copy_internal_package_object: Package allocation failure\n"));
+                ACPI_REPORT_ERROR(("Package allocation failure\n"));
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c
index d80e92639932..35f3d581e034 100644
--- a/drivers/acpi/utilities/utdebug.c
+++ b/drivers/acpi/utilities/utdebug.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/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c
index 2bc878f7a127..1079a1a1f195 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/utilities/utdelete.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
@@ -363,8 +363,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
 
         default:
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown action (%X)\n",
-                                  action));
+                ACPI_REPORT_ERROR(("Unknown action (%X)\n", action));
                 break;
         }
 
@@ -374,9 +373,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
          */
         if (count > ACPI_MAX_REFERENCE_COUNT) {
 
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                  "**** Warning **** Large Reference Count (%X) in object %p\n\n",
-                                  count, object));
+                ACPI_REPORT_WARNING(("Large Reference Count (%X) in object %p\n\n", count, object));
         }
 
         return;
diff --git a/drivers/acpi/utilities/uteval.c b/drivers/acpi/utilities/uteval.c
index cd63a2d93fe3..f4dc374a0eec 100644
--- a/drivers/acpi/utilities/uteval.c
+++ b/drivers/acpi/utilities/uteval.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
@@ -154,8 +154,8 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
                                           acpi_ut_get_node_name(prefix_node),
                                           path));
                 } else {
-                        ACPI_REPORT_METHOD_ERROR("Method execution failed",
-                                                 prefix_node, path, status);
+                        ACPI_REPORT_MTERROR("Method execution failed",
+                                            prefix_node, path, status);
                 }
 
                 return_ACPI_STATUS(status);
@@ -165,9 +165,8 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
 
         if (!info.return_object) {
                 if (expected_return_btypes) {
-                        ACPI_REPORT_METHOD_ERROR("No object was returned from",
-                                                 prefix_node, path,
-                                                 AE_NOT_EXIST);
+                        ACPI_REPORT_MTERROR("No object was returned from",
+                                            prefix_node, path, AE_NOT_EXIST);
 
                         return_ACPI_STATUS(AE_NOT_EXIST);
                 }
@@ -212,15 +211,10 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
         /* Is the return object one of the expected types? */
 
         if (!(expected_return_btypes & return_btype)) {
-                ACPI_REPORT_METHOD_ERROR("Return object type is incorrect",
-                                         prefix_node, path, AE_TYPE);
-
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Type returned from %s was incorrect: %s, expected Btypes: %X\n",
-                                  path,
-                                  acpi_ut_get_object_type_name(info.
-                                                               return_object),
-                                  expected_return_btypes));
+                ACPI_REPORT_MTERROR("Return object type is incorrect",
+                                    prefix_node, path, AE_TYPE);
+
+                ACPI_REPORT_ERROR(("Type returned from %s was incorrect: %s, expected Btypes: %X\n", path, acpi_ut_get_object_type_name(info.return_object), expected_return_btypes));
 
                 /* On error exit, we must delete the return object */
 
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index 7c59c2b0d953..87ca9a0a8b76 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.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
@@ -67,8 +67,11 @@ const char *acpi_format_exception(acpi_status status)
         acpi_status sub_status;
         const char *exception = NULL;
 
-        ACPI_FUNCTION_NAME("format_exception");
+        ACPI_FUNCTION_ENTRY();
 
+        /*
+         * Status is composed of two parts, a "type" and an actual code
+         */
         sub_status = (status & ~AE_CODE_MASK);
 
         switch (status & AE_CODE_MASK) {
@@ -118,13 +121,13 @@ const char *acpi_format_exception(acpi_status status)
         if (!exception) {
                 /* Exception code was not recognized */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unknown exception code: 0x%8.8X\n", status));
+                ACPI_REPORT_ERROR(("Unknown exception code: 0x%8.8X\n",
+                                   status));
 
-                return ((const char *)"UNKNOWN_STATUS_CODE");
+                exception = "UNKNOWN_STATUS_CODE";
         }
 
-        return ((const char *)exception);
+        return (ACPI_CAST_PTR(const char, exception));
 }
 
 /*******************************************************************************
@@ -519,7 +522,7 @@ char *acpi_ut_get_event_name(u32 event_id)
                 return ("invalid_event_iD");
         }
 
-        return ((char *)acpi_gbl_event_types[event_id]);
+        return (ACPI_CAST_PTR(char, acpi_gbl_event_types[event_id]));
 }
 
 /*******************************************************************************
@@ -586,10 +589,10 @@ char *acpi_ut_get_type_name(acpi_object_type type)
 {
 
         if (type > ACPI_TYPE_INVALID) {
-                return ((char *)acpi_gbl_bad_type);
+                return (ACPI_CAST_PTR(char, acpi_gbl_bad_type));
         }
 
-        return ((char *)acpi_gbl_ns_type_names[type]);
+        return (ACPI_CAST_PTR(char, acpi_gbl_ns_type_names[type]));
 }
 
 char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc)
diff --git a/drivers/acpi/utilities/utinit.c b/drivers/acpi/utilities/utinit.c
index 9dde82b0beaf..7565ba6f90d5 100644
--- a/drivers/acpi/utilities/utinit.c
+++ b/drivers/acpi/utilities/utinit.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
@@ -221,15 +221,14 @@ void acpi_ut_subsystem_shutdown(void)
         /* Just exit if subsystem is already shutdown */
 
         if (acpi_gbl_shutdown) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "ACPI Subsystem is already terminated\n"));
+                ACPI_REPORT_ERROR(("ACPI Subsystem is already terminated\n"));
                 return_VOID;
         }
 
         /* Subsystem appears active, go ahead and shut it down */
 
         acpi_gbl_shutdown = TRUE;
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem...\n"));
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem\n"));
 
         /* Close the acpi_event Handling */
 
diff --git a/drivers/acpi/utilities/utmath.c b/drivers/acpi/utilities/utmath.c
index 68a0a6f94129..06214201329d 100644
--- a/drivers/acpi/utilities/utmath.c
+++ b/drivers/acpi/utilities/utmath.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
@@ -82,7 +82,7 @@ acpi_ut_short_divide(acpi_integer dividend,
         /* Always check for a zero divisor */
 
         if (divisor == 0) {
-                ACPI_REPORT_ERROR(("acpi_ut_short_divide: Divide by zero\n"));
+                ACPI_REPORT_ERROR(("Divide by zero\n"));
                 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
         }
 
@@ -144,7 +144,7 @@ acpi_ut_divide(acpi_integer in_dividend,
         /* Always check for a zero divisor */
 
         if (in_divisor == 0) {
-                ACPI_REPORT_ERROR(("acpi_ut_divide: Divide by zero\n"));
+                ACPI_REPORT_ERROR(("Divide by zero\n"));
                 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
         }
 
@@ -266,7 +266,7 @@ acpi_ut_short_divide(acpi_integer in_dividend,
         /* Always check for a zero divisor */
 
         if (divisor == 0) {
-                ACPI_REPORT_ERROR(("acpi_ut_short_divide: Divide by zero\n"));
+                ACPI_REPORT_ERROR(("Divide by zero\n"));
                 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
         }
 
@@ -292,7 +292,7 @@ acpi_ut_divide(acpi_integer in_dividend,
         /* Always check for a zero divisor */
 
         if (in_divisor == 0) {
-                ACPI_REPORT_ERROR(("acpi_ut_divide: Divide by zero\n"));
+                ACPI_REPORT_ERROR(("Divide by zero\n"));
                 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
         }
 
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index 48d511d5c04b..a77ffcd5570f 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.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
@@ -841,7 +841,6 @@ u8 acpi_ut_generate_checksum(u8 * buffer, u32 length)
  *
  * 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)
  *
  * RETURN:      None
  *
@@ -849,10 +848,10 @@ u8 acpi_ut_generate_checksum(u8 * buffer, u32 length)
  *
  ******************************************************************************/
 
-void acpi_ut_report_error(char *module_name, u32 line_number, u32 component_id)
+void acpi_ut_report_error(char *module_name, u32 line_number)
 {
 
-        acpi_os_printf("%8s-%04d: *** Error: ", module_name, line_number);
+        acpi_os_printf("ACPI Error (%s-%04d): ", module_name, line_number);
 }
 
 /*******************************************************************************
@@ -861,7 +860,6 @@ void acpi_ut_report_error(char *module_name, u32 line_number, u32 component_id)
  *
  * 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)
  *
  * RETURN:      None
  *
@@ -869,11 +867,10 @@ void acpi_ut_report_error(char *module_name, u32 line_number, u32 component_id)
  *
  ******************************************************************************/
 
-void
-acpi_ut_report_warning(char *module_name, u32 line_number, u32 component_id)
+void acpi_ut_report_warning(char *module_name, u32 line_number)
 {
 
-        acpi_os_printf("%8s-%04d: *** Warning: ", module_name, line_number);
+        acpi_os_printf("ACPI Warning (%s-%04d): ", module_name, line_number);
 }
 
 /*******************************************************************************
@@ -882,7 +879,6 @@ acpi_ut_report_warning(char *module_name, u32 line_number, u32 component_id)
  *
  * 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)
  *
  * RETURN:      None
  *
@@ -890,8 +886,8 @@ acpi_ut_report_warning(char *module_name, u32 line_number, u32 component_id)
  *
  ******************************************************************************/
 
-void acpi_ut_report_info(char *module_name, u32 line_number, u32 component_id)
+void acpi_ut_report_info(char *module_name, u32 line_number)
 {
 
-        acpi_os_printf("%8s-%04d: *** Info: ", module_name, line_number);
+        acpi_os_printf("ACPI (%s-%04d): ", module_name, line_number);
 }
diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c
index e158b1b6313b..ffaff55270b1 100644
--- a/drivers/acpi/utilities/utmutex.c
+++ b/drivers/acpi/utilities/utmutex.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
@@ -216,21 +216,12 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
                 for (i = mutex_id; i < MAX_MUTEX; i++) {
                         if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {
                                 if (i == mutex_id) {
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "Mutex [%s] already acquired by this thread [%X]\n",
-                                                          acpi_ut_get_mutex_name
-                                                          (mutex_id),
-                                                          this_thread_id));
+                                        ACPI_REPORT_ERROR(("Mutex [%s] already acquired by this thread [%X]\n", acpi_ut_get_mutex_name(mutex_id), this_thread_id));
 
                                         return (AE_ALREADY_ACQUIRED);
                                 }
 
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Invalid acquire order: Thread %X owns [%s], wants [%s]\n",
-                                                  this_thread_id,
-                                                  acpi_ut_get_mutex_name(i),
-                                                  acpi_ut_get_mutex_name
-                                                  (mutex_id)));
+                                ACPI_REPORT_ERROR(("Invalid acquire order: Thread %X owns [%s], wants [%s]\n", this_thread_id, acpi_ut_get_mutex_name(i), acpi_ut_get_mutex_name(mutex_id)));
 
                                 return (AE_ACQUIRE_DEADLOCK);
                         }
@@ -253,11 +244,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
                 acpi_gbl_mutex_info[mutex_id].use_count++;
                 acpi_gbl_mutex_info[mutex_id].thread_id = this_thread_id;
         } else {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Thread %X could not acquire Mutex [%s] %s\n",
-                                  this_thread_id,
-                                  acpi_ut_get_mutex_name(mutex_id),
-                                  acpi_format_exception(status)));
+                ACPI_REPORT_ERROR(("Thread %X could not acquire Mutex [%X] %s\n", this_thread_id, mutex_id, acpi_format_exception(status)));
         }
 
         return (status);
@@ -295,9 +282,7 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
          * Mutex must be acquired in order to release it!
          */
         if (acpi_gbl_mutex_info[mutex_id].thread_id == ACPI_MUTEX_NOT_ACQUIRED) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Mutex [%s] is not acquired, cannot release\n",
-                                  acpi_ut_get_mutex_name(mutex_id)));
+                ACPI_REPORT_ERROR(("Mutex [%X] is not acquired, cannot release\n", mutex_id));
 
                 return (AE_NOT_ACQUIRED);
         }
@@ -318,11 +303,7 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
                                         continue;
                                 }
 
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Invalid release order: owns [%s], releasing [%s]\n",
-                                                  acpi_ut_get_mutex_name(i),
-                                                  acpi_ut_get_mutex_name
-                                                  (mutex_id)));
+                                ACPI_REPORT_ERROR(("Invalid release order: owns [%s], releasing [%s]\n", acpi_ut_get_mutex_name(i), acpi_ut_get_mutex_name(mutex_id)));
 
                                 return (AE_RELEASE_DEADLOCK);
                         }
@@ -338,11 +319,7 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
             acpi_os_signal_semaphore(acpi_gbl_mutex_info[mutex_id].mutex, 1);
 
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Thread %X could not release Mutex [%s] %s\n",
-                                  this_thread_id,
-                                  acpi_ut_get_mutex_name(mutex_id),
-                                  acpi_format_exception(status)));
+                ACPI_REPORT_ERROR(("Thread %X could not release Mutex [%X] %s\n", this_thread_id, mutex_id, acpi_format_exception(status)));
         } else {
                 ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
                                   "Thread %X released Mutex [%s]\n",
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index 3015e1540053..1b6b21577805 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.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
@@ -177,7 +177,8 @@ union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size)
 
                 buffer = ACPI_MEM_CALLOCATE(buffer_size);
                 if (!buffer) {
-                        ACPI_REPORT_ERROR(("create_buffer: could not allocate size %X\n", (u32) buffer_size));
+                        ACPI_REPORT_ERROR(("Could not allocate size %X\n",
+                                           (u32) buffer_size));
                         acpi_ut_remove_reference(buffer_desc);
                         return_PTR(NULL);
                 }
@@ -228,7 +229,8 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)
          */
         string = ACPI_MEM_CALLOCATE(string_size + 1);
         if (!string) {
-                ACPI_REPORT_ERROR(("create_string: could not allocate size %X\n", (u32) string_size));
+                ACPI_REPORT_ERROR(("Could not allocate size %X\n",
+                                   (u32) string_size));
                 acpi_ut_remove_reference(string_desc);
                 return_PTR(NULL);
         }
@@ -310,7 +312,7 @@ void *acpi_ut_allocate_object_desc_dbg(char *module_name,
 
         object = acpi_os_acquire_object(acpi_gbl_operand_cache);
         if (!object) {
-                _ACPI_REPORT_ERROR(module_name, line_number, component_id,
+                _ACPI_REPORT_ERROR(module_name, line_number,
                                    ("Could not allocate an object descriptor\n"));
 
                 return_PTR(NULL);
@@ -345,9 +347,9 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object)
         /* Object must be an union acpi_operand_object    */
 
         if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "%p is not an ACPI Operand object [%s]\n",
-                                  object, acpi_ut_get_descriptor_name(object)));
+                ACPI_REPORT_ERROR(("%p is not an ACPI Operand object [%s]\n",
+                                   object,
+                                   acpi_ut_get_descriptor_name(object)));
                 return_VOID;
         }
 
@@ -449,10 +451,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
                          * Notably, Locals and Args are not supported, but this may be
                          * required eventually.
                          */
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Unsupported Reference opcode=%X in object %p\n",
-                                          internal_object->reference.opcode,
-                                          internal_object));
+                        ACPI_REPORT_ERROR(("Unsupported Reference opcode=%X in object %p\n", internal_object->reference.opcode, internal_object));
                         status = AE_TYPE;
                         break;
                 }
@@ -460,10 +459,9 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
 
         default:
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unsupported type=%X in object %p\n",
-                                  ACPI_GET_OBJECT_TYPE(internal_object),
-                                  internal_object));
+                ACPI_REPORT_ERROR(("Unsupported type=%X in object %p\n",
+                                   ACPI_GET_OBJECT_TYPE(internal_object),
+                                   internal_object));
                 status = AE_TYPE;
                 break;
         }
diff --git a/drivers/acpi/utilities/utresrc.c b/drivers/acpi/utilities/utresrc.c
index eaf0edec6efe..36bf9e4bf529 100644
--- a/drivers/acpi/utilities/utresrc.c
+++ b/drivers/acpi/utilities/utresrc.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/utilities/utstate.c b/drivers/acpi/utilities/utstate.c
index 6ff1d7073349..4b134a722907 100644
--- a/drivers/acpi/utilities/utstate.c
+++ b/drivers/acpi/utilities/utstate.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/utilities/utxface.c b/drivers/acpi/utilities/utxface.c
index 57adc5bc02f3..b4bc94883200 100644
--- a/drivers/acpi/utilities/utxface.c
+++ b/drivers/acpi/utilities/utxface.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_status acpi_initialize_subsystem(void)
 
         status = acpi_os_initialize();
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("OSD failed to initialize, %s\n",
+                ACPI_REPORT_ERROR(("OSL failed to initialize, %s\n",
                                    acpi_format_exception(status)));
                 return_ACPI_STATUS(status);
         }
@@ -154,8 +154,7 @@ acpi_status acpi_enable_subsystem(u32 flags)
 
                 status = acpi_enable();
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                          "acpi_enable failed.\n"));
+                        ACPI_REPORT_WARNING(("acpi_enable failed\n"));
                         return_ACPI_STATUS(status);
                 }
         }