[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>

23 files changed, 167 insertions, 292 deletions

diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index 1ce365d651d8..109d0255a5bb 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.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
@@ -413,9 +413,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
             (!ACPI_STRNCMP(table_ptr->signature,
                            acpi_gbl_table_data[ACPI_TABLE_SSDT].signature,
                            acpi_gbl_table_data[ACPI_TABLE_SSDT].sig_length))) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Table has invalid signature [%4.4s], must be SSDT or PSDT\n",
-                                  table_ptr->signature));
+                ACPI_REPORT_ERROR(("Table has invalid signature [%4.4s], must be SSDT or PSDT\n", table_ptr->signature));
                 status = AE_BAD_SIGNATURE;
                 goto cleanup;
         }
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index fa9e75d4ec65..e6f55cf8ad31 100644
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.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
@@ -654,17 +654,8 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
                 break;
 
         default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unknown Target type ID 0x%X Op %s dest_type %s\n",
-                                  GET_CURRENT_ARG_TYPE(walk_state->op_info->
-                                                       runtime_args),
-                                  walk_state->op_info->name,
-                                  acpi_ut_get_type_name(destination_type)));
-
-                ACPI_REPORT_ERROR(("Bad Target Type (ARGI): %X\n",
-                                   GET_CURRENT_ARG_TYPE(walk_state->op_info->
-                                                        runtime_args)))
-                    status = AE_AML_INTERNAL;
+                ACPI_REPORT_ERROR(("Unknown Target type ID 0x%X aml_opcode %X dest_type %s\n", GET_CURRENT_ARG_TYPE(walk_state->op_info->runtime_args), walk_state->opcode, acpi_ut_get_type_name(destination_type)));
+                status = AE_AML_INTERNAL;
         }
 
         /*
diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c
index 91c49188fb07..da313dad576a 100644
--- a/drivers/acpi/executer/excreate.c
+++ b/drivers/acpi/executer/excreate.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/executer/exdump.c b/drivers/acpi/executer/exdump.c
index 17c79cd91b31..a7cca8d4f855 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.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/executer/exfield.c b/drivers/acpi/executer/exfield.c
index ab1ba399aa28..78a76f91a1c9 100644
--- a/drivers/acpi/executer/exfield.c
+++ b/drivers/acpi/executer/exfield.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/executer/exfldio.c b/drivers/acpi/executer/exfldio.c
index ba6e08843c29..9fe27fd04a2f 100644
--- a/drivers/acpi/executer/exfldio.c
+++ b/drivers/acpi/executer/exfldio.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
@@ -94,10 +94,9 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
         /* We must have a valid region */
 
         if (ACPI_GET_OBJECT_TYPE(rgn_desc) != ACPI_TYPE_REGION) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Needed Region, found type %X (%s)\n",
-                                  ACPI_GET_OBJECT_TYPE(rgn_desc),
-                                  acpi_ut_get_object_type_name(rgn_desc)));
+                ACPI_REPORT_ERROR(("Needed Region, found type %X (%s)\n",
+                                   ACPI_GET_OBJECT_TYPE(rgn_desc),
+                                   acpi_ut_get_object_type_name(rgn_desc)));
 
                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
         }
@@ -162,31 +161,14 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
                          * than the region itself.  For example, a region of length one
                          * byte, and a field with Dword access specified.
                          */
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Field [%4.4s] access width (%d bytes) too large for region [%4.4s] (length %X)\n",
-                                          acpi_ut_get_node_name(obj_desc->
-                                                                common_field.
-                                                                node),
-                                          obj_desc->common_field.
-                                          access_byte_width,
-                                          acpi_ut_get_node_name(rgn_desc->
-                                                                region.node),
-                                          rgn_desc->region.length));
+                        ACPI_REPORT_ERROR(("Field [%4.4s] access width (%d bytes) too large for region [%4.4s] (length %X)\n", acpi_ut_get_node_name(obj_desc->common_field.node), obj_desc->common_field.access_byte_width, acpi_ut_get_node_name(rgn_desc->region.node), rgn_desc->region.length));
                 }
 
                 /*
                  * Offset rounded up to next multiple of field width
                  * exceeds region length, indicate an error
                  */
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Field [%4.4s] Base+Offset+Width %X+%X+%X is beyond end of region [%4.4s] (length %X)\n",
-                                  acpi_ut_get_node_name(obj_desc->common_field.
-                                                        node),
-                                  obj_desc->common_field.base_byte_offset,
-                                  field_datum_byte_offset,
-                                  obj_desc->common_field.access_byte_width,
-                                  acpi_ut_get_node_name(rgn_desc->region.node),
-                                  rgn_desc->region.length));
+                ACPI_REPORT_ERROR(("Field [%4.4s] Base+Offset+Width %X+%X+%X is beyond end of region [%4.4s] (length %X)\n", acpi_ut_get_node_name(obj_desc->common_field.node), obj_desc->common_field.base_byte_offset, field_datum_byte_offset, obj_desc->common_field.access_byte_width, acpi_ut_get_node_name(rgn_desc->region.node), rgn_desc->region.length));
 
                 return_ACPI_STATUS(AE_AML_REGION_LIMIT);
         }
@@ -270,12 +252,11 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
 
         if (ACPI_FAILURE(status)) {
                 if (status == AE_NOT_IMPLEMENTED) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Region %s(%X) not implemented\n",
-                                          acpi_ut_get_region_name(rgn_desc->
-                                                                  region.
-                                                                  space_id),
-                                          rgn_desc->region.space_id));
+                        ACPI_REPORT_ERROR(("Region %s(%X) not implemented\n",
+                                           acpi_ut_get_region_name(rgn_desc->
+                                                                   region.
+                                                                   space_id),
+                                           rgn_desc->region.space_id));
                 } else if (status == AE_NOT_EXIST) {
                         ACPI_REPORT_ERROR(("Region %s(%X) has no handler\n",
                                            acpi_ut_get_region_name(rgn_desc->
@@ -618,11 +599,10 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
 
                 default:
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "write_with_update_rule: Unknown update_rule setting: %X\n",
-                                          (obj_desc->common_field.
-                                           field_flags &
-                                           AML_FIELD_UPDATE_RULE_MASK)));
+                        ACPI_REPORT_ERROR(("Unknown update_rule value: %X\n",
+                                           (obj_desc->common_field.
+                                            field_flags &
+                                            AML_FIELD_UPDATE_RULE_MASK)));
                         return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
                 }
         }
@@ -677,10 +657,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
 
         if (buffer_length <
             ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Field size %X (bits) is too large for buffer (%X)\n",
-                                  obj_desc->common_field.bit_length,
-                                  buffer_length));
+                ACPI_REPORT_ERROR(("Field size %X (bits) is too large for buffer (%X)\n", obj_desc->common_field.bit_length, buffer_length));
 
                 return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
         }
@@ -792,10 +769,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
 
         if (buffer_length <
             ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Field size %X (bits) is too large for buffer (%X)\n",
-                                  obj_desc->common_field.bit_length,
-                                  buffer_length));
+                ACPI_REPORT_ERROR(("Field size %X (bits) is too large for buffer (%X)\n", obj_desc->common_field.bit_length, buffer_length));
 
                 return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
         }
diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
index 0778bff632bf..5ad34566738c 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/executer/exmisc.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
@@ -98,7 +98,8 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
 
                 default:
 
-                        ACPI_REPORT_ERROR(("Unknown Reference opcode in get_reference %X\n", obj_desc->reference.opcode));
+                        ACPI_REPORT_ERROR(("Unknown Reference opcode %X\n",
+                                           obj_desc->reference.opcode));
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
                 break;
@@ -113,7 +114,8 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
 
         default:
 
-                ACPI_REPORT_ERROR(("Invalid descriptor type in get_reference: %X\n", ACPI_GET_DESCRIPTOR_TYPE(obj_desc)));
+                ACPI_REPORT_ERROR(("Invalid descriptor type %X\n",
+                                   ACPI_GET_DESCRIPTOR_TYPE(obj_desc)));
                 return_ACPI_STATUS(AE_TYPE);
         }
 
@@ -266,7 +268,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
                 break;
 
         default:
-                ACPI_REPORT_ERROR(("Concatanate - invalid object type: %X\n",
+                ACPI_REPORT_ERROR(("Invalid object type: %X\n",
                                    ACPI_GET_OBJECT_TYPE(operand0)));
                 status = AE_AML_INTERNAL;
         }
@@ -368,7 +370,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
                 /* Invalid object type, should not happen here */
 
-                ACPI_REPORT_ERROR(("Concatenate - Invalid object type: %X\n",
+                ACPI_REPORT_ERROR(("Invalid object type: %X\n",
                                    ACPI_GET_OBJECT_TYPE(operand0)));
                 status = AE_AML_INTERNAL;
                 goto cleanup;
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c
index ab47f6d8b5c0..89b8ab79410b 100644
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/executer/exmutex.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/executer/exnames.c b/drivers/acpi/executer/exnames.c
index 7bb5e17b5680..de3216b6a4fc 100644
--- 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_REPORT_ERROR(("Could not allocate size %d\n",
+                                   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_REPORT_ERROR(("Invalid leading digit: %c\n", char_buf[0]));
                 return_ACPI_STATUS(AE_CTRL_PENDING);
         }
 
@@ -211,9 +211,8 @@ 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_REPORT_ERROR(("Bad character %02x in name, at %p\n",
+                                   *aml_address, aml_address));
         }
 
         *in_aml_address = ACPI_CAST_PTR(u8, aml_address);
@@ -412,8 +411,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_REPORT_ERROR(("Malformed Name at %p\n", name_string));
                 status = AE_AML_BAD_NAME;
         }
 
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index 97e34542f5e4..bc8837ecb716 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.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
@@ -111,7 +111,8 @@ acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state)
 
         default:                /*  Unknown opcode  */
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_0A_0T_1R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
+                                   walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 break;
         }
@@ -188,7 +189,8 @@ acpi_status acpi_ex_opcode_1A_0T_0R(struct acpi_walk_state *walk_state)
 
         default:                /*  Unknown opcode  */
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_0T_0R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
+                                   walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 break;
         }
@@ -227,7 +229,8 @@ acpi_status acpi_ex_opcode_1A_1T_0R(struct acpi_walk_state *walk_state)
 
         default:                /* Unknown opcode */
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_1T_0R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
+                                   walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
@@ -346,9 +349,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                                 /* Check the range of the digit */
 
                                 if (temp32 > 9) {
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "BCD digit too large (not decimal): 0x%X\n",
-                                                          temp32));
+                                        ACPI_REPORT_ERROR(("BCD digit too large (not decimal): 0x%X\n", temp32));
 
                                         status = AE_AML_NUMERIC_OVERFLOW;
                                         goto cleanup;
@@ -393,12 +394,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                         /* Overflow if there is any data left in Digit */
 
                         if (digit > 0) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Integer too large to convert to BCD: %8.8X%8.8X\n",
-                                                  ACPI_FORMAT_UINT64(operand
-                                                                     [0]->
-                                                                     integer.
-                                                                     value)));
+                                ACPI_REPORT_ERROR(("Integer too large to convert to BCD: %8.8X%8.8X\n", ACPI_FORMAT_UINT64(operand[0]->integer.value)));
                                 status = AE_AML_NUMERIC_OVERFLOW;
                                 goto cleanup;
                         }
@@ -525,15 +521,16 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
 
                 /* These are two obsolete opcodes */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "%s is obsolete and not implemented\n",
-                                  acpi_ps_get_opcode_name(walk_state->opcode)));
+                ACPI_REPORT_ERROR(("%s is obsolete and not implemented\n",
+                                   acpi_ps_get_opcode_name(walk_state->
+                                                           opcode)));
                 status = AE_SUPPORT;
                 goto cleanup;
 
         default:                /* Unknown opcode */
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_1T_1R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
+                                   walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
@@ -639,11 +636,10 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                     acpi_ex_resolve_operands(AML_LNOT_OP, &temp_desc,
                                              walk_state);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "%s: bad operand(s) %s\n",
-                                          acpi_ps_get_opcode_name(walk_state->
-                                                                  opcode),
-                                          acpi_format_exception(status)));
+                        ACPI_REPORT_ERROR(("%s: bad operand(s) %s\n",
+                                           acpi_ps_get_opcode_name(walk_state->
+                                                                   opcode),
+                                           acpi_format_exception(status)));
 
                         goto cleanup;
                 }
@@ -742,9 +738,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                         break;
 
                 default:
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "size_of - Operand is not Buf/Int/Str/Pkg - found type %s\n",
-                                          acpi_ut_get_type_name(type)));
+                        ACPI_REPORT_ERROR(("Operand is not Buf/Int/Str/Pkg - found type %s\n", acpi_ut_get_type_name(type)));
                         status = AE_AML_OPERAND_TYPE;
                         goto cleanup;
                 }
@@ -941,11 +935,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
 
                                 default:
 
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "Unknown Index target_type %X in obj %p\n",
-                                                          operand[0]->reference.
-                                                          target_type,
-                                                          operand[0]));
+                                        ACPI_REPORT_ERROR(("Unknown Index target_type %X in obj %p\n", operand[0]->reference.target_type, operand[0]));
                                         status = AE_AML_OPERAND_TYPE;
                                         goto cleanup;
                                 }
@@ -971,11 +961,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                 break;
 
                         default:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Unknown opcode in ref(%p) - %X\n",
-                                                  operand[0],
-                                                  operand[0]->reference.
-                                                  opcode));
+                                ACPI_REPORT_ERROR(("Unknown opcode in ref(%p) - %X\n", operand[0], operand[0]->reference.opcode));
 
                                 status = AE_TYPE;
                                 goto cleanup;
@@ -985,7 +971,8 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_0T_1R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
+                                   walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
diff --git a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/executer/exoparg2.c
index d8472842c1fd..7c59dda40946 100644
--- a/drivers/acpi/executer/exoparg2.c
+++ b/drivers/acpi/executer/exoparg2.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
@@ -111,9 +111,7 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
                 /* Are notifies allowed on this object? */
 
                 if (!acpi_ev_is_notify_object(node)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Unexpected notify object type [%s]\n",
-                                          acpi_ut_get_type_name(node->type)));
+                        ACPI_REPORT_ERROR(("Unexpected notify object type [%s]\n", acpi_ut_get_type_name(node->type)));
 
                         status = AE_AML_OPERAND_TYPE;
                         break;
@@ -157,7 +155,8 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_2A_0T_0R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
+                                   walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
         }
 
@@ -221,7 +220,8 @@ acpi_status acpi_ex_opcode_2A_2T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_2A_2T_1R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
+                                   walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
@@ -389,10 +389,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                         /* Object to be indexed is a Package */
 
                         if (index >= operand[0]->package.count) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Index value (%X%8.8X) beyond package end (%X)\n",
-                                                  ACPI_FORMAT_UINT64(index),
-                                                  operand[0]->package.count));
+                                ACPI_REPORT_ERROR(("Index value (%X%8.8X) beyond package end (%X)\n", ACPI_FORMAT_UINT64(index), operand[0]->package.count));
                                 status = AE_AML_PACKAGE_LIMIT;
                                 goto cleanup;
                         }
@@ -405,10 +402,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                         /* Object to be indexed is a Buffer/String */
 
                         if (index >= operand[0]->buffer.length) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Index value (%X%8.8X) beyond end of buffer (%X)\n",
-                                                  ACPI_FORMAT_UINT64(index),
-                                                  operand[0]->buffer.length));
+                                ACPI_REPORT_ERROR(("Index value (%X%8.8X) beyond end of buffer (%X)\n", ACPI_FORMAT_UINT64(index), operand[0]->buffer.length));
                                 status = AE_AML_BUFFER_LIMIT;
                                 goto cleanup;
                         }
@@ -440,7 +434,8 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_2A_1T_1R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
+                                   walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 break;
         }
@@ -544,7 +539,8 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_2A_0T_1R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
+                                   walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c
index 2ea1c322970b..a979b338a491 100644
--- a/drivers/acpi/executer/exoparg3.c
+++ b/drivers/acpi/executer/exoparg3.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
@@ -119,7 +119,8 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_3A_0T_0R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
+                                   walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
@@ -242,7 +243,8 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_3A_0T_0R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
+                                   walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
diff --git a/drivers/acpi/executer/exoparg6.c b/drivers/acpi/executer/exoparg6.c
index 5dee77139576..05e7f9b67f29 100644
--- a/drivers/acpi/executer/exoparg6.c
+++ b/drivers/acpi/executer/exoparg6.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
@@ -234,8 +234,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
 
                 if ((operand[1]->integer.value > MAX_MATCH_OPERATOR) ||
                     (operand[3]->integer.value > MAX_MATCH_OPERATOR)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Match operator out of range\n"));
+                        ACPI_REPORT_ERROR(("Match operator out of range\n"));
                         status = AE_AML_OPERAND_VALUE;
                         goto cleanup;
                 }
@@ -244,10 +243,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
 
                 index = operand[5]->integer.value;
                 if (index >= operand[0]->package.count) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Index (%X%8.8X) beyond package end (%X)\n",
-                                          ACPI_FORMAT_UINT64(index),
-                                          operand[0]->package.count));
+                        ACPI_REPORT_ERROR(("Index (%X%8.8X) beyond package end (%X)\n", ACPI_FORMAT_UINT64(index), operand[0]->package.count));
                         status = AE_AML_PACKAGE_LIMIT;
                         goto cleanup;
                 }
@@ -316,7 +312,8 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_6A_0T_1R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_REPORT_ERROR(("Unknown AML opcode %X\n",
+                                   walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index 88ccbf3b29d0..3bde780c94cf 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.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
@@ -274,8 +274,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
         default:
                 /* Invalid field access type */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unknown field access type %X\n", access));
+                ACPI_REPORT_ERROR(("Unknown field access type %X\n", access));
                 return_UINT32(0);
         }
 
@@ -422,15 +421,13 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
 
         if (info->field_type != ACPI_TYPE_LOCAL_INDEX_FIELD) {
                 if (!info->region_node) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null region_node\n"));
+                        ACPI_REPORT_ERROR(("Null region_node\n"));
                         return_ACPI_STATUS(AE_AML_NO_OPERAND);
                 }
 
                 type = acpi_ns_get_type(info->region_node);
                 if (type != ACPI_TYPE_REGION) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Needed Region, found type %X (%s)\n",
-                                          type, acpi_ut_get_type_name(type)));
+                        ACPI_REPORT_ERROR(("Needed Region, found type %X (%s)\n", type, acpi_ut_get_type_name(type)));
 
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index 80118be3f544..82983575cca6 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.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
@@ -103,9 +103,8 @@ acpi_ex_system_memory_space_handler(u32 function,
                 break;
 
         default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Invalid system_memory width %d\n",
-                                  bit_width));
+                ACPI_REPORT_ERROR(("Invalid system_memory width %d\n",
+                                   bit_width));
                 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
         }
 
@@ -159,10 +158,7 @@ acpi_ex_system_memory_space_handler(u32 function,
                                             (void **)&mem_info->
                                             mapped_logical_address);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Could not map memory at %8.8X%8.8X, size %X\n",
-                                          ACPI_FORMAT_UINT64(address),
-                                          (u32) window_size));
+                        ACPI_REPORT_ERROR(("Could not map memory at %8.8X%8.8X, size %X\n", ACPI_FORMAT_UINT64(address), (u32) window_size));
                         mem_info->mapped_length = 0;
                         return_ACPI_STATUS(status);
                 }
diff --git a/drivers/acpi/executer/exresnte.c b/drivers/acpi/executer/exresnte.c
index ff5d8f97e8eb..a5cca7eda210 100644
--- a/drivers/acpi/executer/exresnte.c
+++ b/drivers/acpi/executer/exresnte.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
@@ -122,8 +122,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
         }
 
         if (!source_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "No object attached to node %p\n", node));
+                ACPI_REPORT_ERROR(("No object attached to node %p\n", node));
                 return_ACPI_STATUS(AE_AML_NO_OPERAND);
         }
 
@@ -135,10 +134,9 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
         case ACPI_TYPE_PACKAGE:
 
                 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_PACKAGE) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Object not a Package, type %s\n",
-                                          acpi_ut_get_object_type_name
-                                          (source_desc)));
+                        ACPI_REPORT_ERROR(("Object not a Package, type %s\n",
+                                           acpi_ut_get_object_type_name
+                                           (source_desc)));
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
@@ -154,10 +152,9 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
         case ACPI_TYPE_BUFFER:
 
                 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_BUFFER) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Object not a Buffer, type %s\n",
-                                          acpi_ut_get_object_type_name
-                                          (source_desc)));
+                        ACPI_REPORT_ERROR(("Object not a Buffer, type %s\n",
+                                           acpi_ut_get_object_type_name
+                                           (source_desc)));
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
@@ -173,10 +170,9 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
         case ACPI_TYPE_STRING:
 
                 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_STRING) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Object not a String, type %s\n",
-                                          acpi_ut_get_object_type_name
-                                          (source_desc)));
+                        ACPI_REPORT_ERROR(("Object not a String, type %s\n",
+                                           acpi_ut_get_object_type_name
+                                           (source_desc)));
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
@@ -189,10 +185,9 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
         case ACPI_TYPE_INTEGER:
 
                 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_INTEGER) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Object not a Integer, type %s\n",
-                                          acpi_ut_get_object_type_name
-                                          (source_desc)));
+                        ACPI_REPORT_ERROR(("Object not a Integer, type %s\n",
+                                           acpi_ut_get_object_type_name
+                                           (source_desc)));
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
@@ -236,9 +231,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
 
         case ACPI_TYPE_ANY:
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Untyped entry %p, no attached object!\n",
-                                  node));
+                ACPI_REPORT_ERROR(("Untyped entry %p, no attached object!\n",
+                                   node));
 
                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);        /* Cannot be AE_TYPE */
 
@@ -257,12 +251,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
                 default:
                         /* No named references are allowed here */
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Unsupported Reference opcode %X (%s)\n",
-                                          source_desc->reference.opcode,
-                                          acpi_ps_get_opcode_name(source_desc->
-                                                                  reference.
-                                                                  opcode)));
+                        ACPI_REPORT_ERROR(("Unsupported Reference opcode %X (%s)\n", source_desc->reference.opcode, acpi_ps_get_opcode_name(source_desc->reference.opcode)));
 
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
@@ -272,9 +261,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
 
                 /* Default case is for unknown types */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Node %p - Unknown object type %X\n",
-                                  node, entry_type));
+                ACPI_REPORT_ERROR(("Node %p - Unknown object type %X\n",
+                                   node, entry_type));
 
                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
 
diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
index 97eecbd3242d..ae2d2da00844 100644
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/executer/exresolv.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
@@ -81,7 +81,7 @@ acpi_ex_resolve_to_value(union acpi_operand_object **stack_ptr,
         ACPI_FUNCTION_TRACE_PTR("ex_resolve_to_value", stack_ptr);
 
         if (!stack_ptr || !*stack_ptr) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Internal - null pointer\n"));
+                ACPI_REPORT_ERROR(("Internal - null pointer\n"));
                 return_ACPI_STATUS(AE_AML_NO_OPERAND);
         }
 
@@ -97,8 +97,7 @@ acpi_ex_resolve_to_value(union acpi_operand_object **stack_ptr,
                 }
 
                 if (!*stack_ptr) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Internal - null pointer\n"));
+                        ACPI_REPORT_ERROR(("Internal - null pointer\n"));
                         return_ACPI_STATUS(AE_AML_NO_OPERAND);
                 }
         }
@@ -228,9 +227,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                                          * A NULL object descriptor means an unitialized element of
                                          * the package, can't dereference it
                                          */
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "Attempt to deref an Index to NULL pkg element Idx=%p\n",
-                                                          stack_desc));
+                                        ACPI_REPORT_ERROR(("Attempt to deref an Index to NULL pkg element Idx=%p\n", stack_desc));
                                         status = AE_AML_UNINITIALIZED_ELEMENT;
                                 }
                                 break;
@@ -239,7 +236,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
 
                                 /* Invalid reference object */
 
-                                ACPI_REPORT_ERROR(("During resolve, Unknown target_type %X in Index/Reference obj %p\n", stack_desc->reference.target_type, stack_desc));
+                                ACPI_REPORT_ERROR(("Unknown target_type %X in Index/Reference obj %p\n", stack_desc->reference.target_type, stack_desc));
                                 status = AE_AML_INTERNAL;
                                 break;
                         }
@@ -264,7 +261,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
 
                 default:
 
-                        ACPI_REPORT_ERROR(("During resolve, Unknown Reference opcode %X (%s) in %p\n", opcode, acpi_ps_get_opcode_name(opcode), stack_desc));
+                        ACPI_REPORT_ERROR(("Unknown Reference opcode %X (%s) in %p\n", opcode, acpi_ps_get_opcode_name(opcode), stack_desc));
                         status = AE_AML_INTERNAL;
                         break;
                 }
@@ -386,7 +383,10 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
 
                         if (ACPI_GET_DESCRIPTOR_TYPE(node) !=
                             ACPI_DESC_TYPE_NAMED) {
-                                ACPI_REPORT_ERROR(("acpi_ex_resolve_multiple: Not a NS node %p [%s]\n", node, acpi_ut_get_descriptor_name(node)));
+                                ACPI_REPORT_ERROR(("Not a NS node %p [%s]\n",
+                                                   node,
+                                                   acpi_ut_get_descriptor_name
+                                                   (node)));
                                 return_ACPI_STATUS(AE_AML_INTERNAL);
                         }
 
@@ -442,7 +442,10 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
 
                         if (ACPI_GET_DESCRIPTOR_TYPE(node) !=
                             ACPI_DESC_TYPE_NAMED) {
-                                ACPI_REPORT_ERROR(("acpi_ex_resolve_multiple: Not a NS node %p [%s]\n", node, acpi_ut_get_descriptor_name(node)));
+                                ACPI_REPORT_ERROR(("Not a NS node %p [%s]\n",
+                                                   node,
+                                                   acpi_ut_get_descriptor_name
+                                                   (node)));
                                 return_ACPI_STATUS(AE_AML_INTERNAL);
                         }
 
@@ -511,7 +514,8 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
 
                 default:
 
-                        ACPI_REPORT_ERROR(("acpi_ex_resolve_multiple: Unknown Reference subtype %X\n", obj_desc->reference.opcode));
+                        ACPI_REPORT_ERROR(("Unknown Reference subtype %X\n",
+                                           obj_desc->reference.opcode));
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
         }
diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index b04e4a3707a1..804faebf825c 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.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
@@ -73,7 +73,7 @@ static acpi_status
 acpi_ex_check_object_type(acpi_object_type type_needed,
                           acpi_object_type this_type, void *object)
 {
-        ACPI_FUNCTION_NAME("ex_check_object_type");
+        ACPI_FUNCTION_ENTRY();
 
         if (type_needed == ACPI_TYPE_ANY) {
                 /* All types OK, so we don't perform any typechecks */
@@ -95,10 +95,9 @@ acpi_ex_check_object_type(acpi_object_type type_needed,
         }
 
         if (type_needed != this_type) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Needed [%s], found [%s] %p\n",
-                                  acpi_ut_get_type_name(type_needed),
-                                  acpi_ut_get_type_name(this_type), object));
+                ACPI_REPORT_ERROR(("Needed type [%s], found [%s] %p\n",
+                                   acpi_ut_get_type_name(type_needed),
+                                   acpi_ut_get_type_name(this_type), object));
 
                 return (AE_AML_OPERAND_TYPE);
         }
@@ -151,7 +150,7 @@ acpi_ex_resolve_operands(u16 opcode,
 
         arg_types = op_info->runtime_args;
         if (arg_types == ARGI_INVALID_OPCODE) {
-                ACPI_REPORT_ERROR(("resolve_operands: %X is not a valid AML opcode\n", opcode));
+                ACPI_REPORT_ERROR(("Unknown AML opcode %X\n", opcode));
 
                 return_ACPI_STATUS(AE_AML_INTERNAL);
         }
@@ -169,7 +168,8 @@ acpi_ex_resolve_operands(u16 opcode,
          */
         while (GET_CURRENT_ARG_TYPE(arg_types)) {
                 if (!stack_ptr || !*stack_ptr) {
-                        ACPI_REPORT_ERROR(("resolve_operands: Null stack entry at %p\n", stack_ptr));
+                        ACPI_REPORT_ERROR(("Null stack entry at %p\n",
+                                           stack_ptr));
 
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
@@ -198,9 +198,7 @@ acpi_ex_resolve_operands(u16 opcode,
                         /* Check for bad acpi_object_type */
 
                         if (!acpi_ut_valid_object_type(object_type)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Bad operand object type [%X]\n",
-                                                  object_type));
+                                ACPI_REPORT_ERROR(("Bad operand object type [%X]\n", object_type));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -238,13 +236,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                         break;
 
                                 default:
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "Operand is a Reference, Unknown Reference Opcode %X [%s]\n",
-                                                          obj_desc->reference.
-                                                          opcode,
-                                                          (acpi_ps_get_opcode_info
-                                                           (obj_desc->reference.
-                                                            opcode))->name));
+                                        ACPI_REPORT_ERROR(("Operand is a Reference, Unknown Reference Opcode: %X\n", obj_desc->reference.opcode));
 
                                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                 }
@@ -255,11 +247,10 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         /* Invalid descriptor */
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Invalid descriptor %p [%s]\n",
-                                          obj_desc,
-                                          acpi_ut_get_descriptor_name
-                                          (obj_desc)));
+                        ACPI_REPORT_ERROR(("Invalid descriptor %p [%s]\n",
+                                           obj_desc,
+                                           acpi_ut_get_descriptor_name
+                                           (obj_desc)));
 
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
@@ -417,11 +408,7 @@ acpi_ex_resolve_operands(u16 opcode,
                             acpi_ex_convert_to_integer(obj_desc, stack_ptr, 16);
                         if (ACPI_FAILURE(status)) {
                                 if (status == AE_TYPE) {
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                                          acpi_ut_get_object_type_name
-                                                          (obj_desc),
-                                                          obj_desc));
+                                        ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
 
                                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                 }
@@ -444,11 +431,7 @@ acpi_ex_resolve_operands(u16 opcode,
                         status = acpi_ex_convert_to_buffer(obj_desc, stack_ptr);
                         if (ACPI_FAILURE(status)) {
                                 if (status == AE_TYPE) {
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                                          acpi_ut_get_object_type_name
-                                                          (obj_desc),
-                                                          obj_desc));
+                                        ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
 
                                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                 }
@@ -472,11 +455,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                                            ACPI_IMPLICIT_CONVERT_HEX);
                         if (ACPI_FAILURE(status)) {
                                 if (status == AE_TYPE) {
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                                          acpi_ut_get_object_type_name
-                                                          (obj_desc),
-                                                          obj_desc));
+                                        ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
 
                                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                 }
@@ -502,10 +481,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                                  acpi_ut_get_object_type_name
-                                                  (obj_desc), obj_desc));
+                                ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -539,10 +515,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                                  acpi_ut_get_object_type_name
-                                                  (obj_desc), obj_desc));
+                                ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -566,10 +539,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Needed [Buffer/String/Package/Reference], found [%s] %p\n",
-                                                  acpi_ut_get_object_type_name
-                                                  (obj_desc), obj_desc));
+                                ACPI_REPORT_ERROR(("Needed [Buffer/String/Package/Reference], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -588,10 +558,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Needed [Buffer/String/Package], found [%s] %p\n",
-                                                  acpi_ut_get_object_type_name
-                                                  (obj_desc), obj_desc));
+                                ACPI_REPORT_ERROR(("Needed [Buffer/String/Package], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -611,10 +578,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Needed [Region/region_field], found [%s] %p\n",
-                                                  acpi_ut_get_object_type_name
-                                                  (obj_desc), obj_desc));
+                                ACPI_REPORT_ERROR(("Needed [Region/region_field], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -656,10 +620,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                         break;
                                 }
 
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p\n",
-                                                  acpi_ut_get_object_type_name
-                                                  (obj_desc), obj_desc));
+                                ACPI_REPORT_ERROR(("Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -669,9 +630,7 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         /* Unknown type */
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Internal - Unknown ARGI (required operand) type %X\n",
-                                          this_arg_type));
+                        ACPI_REPORT_ERROR(("Internal - Unknown ARGI (required operand) type %X\n", this_arg_type));
 
                         return_ACPI_STATUS(AE_BAD_PARAMETER);
                 }
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index a7d8eea305c2..202ebe1eb957 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.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
@@ -250,7 +250,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
         /* Validate parameters */
 
         if (!source_desc || !dest_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null parameter\n"));
+                ACPI_REPORT_ERROR(("Null parameter\n"));
                 return_ACPI_STATUS(AE_AML_NO_OPERAND);
         }
 
@@ -290,10 +290,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
 
                 /* Destination is not a Reference object */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Target is not a Reference or Constant object - %s [%p]\n",
-                                  acpi_ut_get_object_type_name(dest_desc),
-                                  dest_desc));
+                ACPI_REPORT_ERROR(("Target is not a Reference or Constant object - %s [%p]\n", acpi_ut_get_object_type_name(dest_desc), dest_desc));
 
                 ACPI_DUMP_STACK_ENTRY(source_desc);
                 ACPI_DUMP_STACK_ENTRY(dest_desc);
@@ -360,7 +357,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
 
         default:
 
-                ACPI_REPORT_ERROR(("ex_store: Unknown Reference opcode %X\n",
+                ACPI_REPORT_ERROR(("Unknown Reference opcode %X\n",
                                    ref_desc->reference.opcode));
                 ACPI_DUMP_ENTRY(ref_desc, ACPI_LV_ERROR);
 
@@ -490,10 +487,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
 
                         /* All other types are invalid */
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Source must be Integer/Buffer/String type, not %s\n",
-                                          acpi_ut_get_object_type_name
-                                          (source_desc)));
+                        ACPI_REPORT_ERROR(("Source must be Integer/Buffer/String type, not %s\n", acpi_ut_get_object_type_name(source_desc)));
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
@@ -503,8 +497,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
                 break;
 
         default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Target is not a Package or buffer_field\n"));
+                ACPI_REPORT_ERROR(("Target is not a Package or buffer_field\n"));
                 status = AE_AML_OPERAND_TYPE;
                 break;
         }
diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
index 382f63c14ea1..25bbc1d78547 100644
--- a/drivers/acpi/executer/exstoren.c
+++ b/drivers/acpi/executer/exstoren.c
@@ -7,7 +7,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
@@ -123,11 +123,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
                       && (source_desc->reference.opcode == AML_LOAD_OP))) {
                         /* Conversion successful but still not a valid type */
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Cannot assign type %s to %s (must be type Int/Str/Buf)\n",
-                                          acpi_ut_get_object_type_name
-                                          (source_desc),
-                                          acpi_ut_get_type_name(target_type)));
+                        ACPI_REPORT_ERROR(("Cannot assign type %s to %s (must be type Int/Str/Buf)\n", acpi_ut_get_object_type_name(source_desc), acpi_ut_get_type_name(target_type)));
                         status = AE_AML_OPERAND_TYPE;
                 }
                 break;
@@ -280,9 +276,8 @@ acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
                 /*
                  * All other types come here.
                  */
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                  "Store into type %s not implemented\n",
-                                  acpi_ut_get_object_type_name(dest_desc)));
+                ACPI_REPORT_WARNING(("Store into type %s not implemented\n",
+                                     acpi_ut_get_object_type_name(dest_desc)));
 
                 status = AE_NOT_IMPLEMENTED;
                 break;
diff --git a/drivers/acpi/executer/exstorob.c b/drivers/acpi/executer/exstorob.c
index 855db7130751..6ab707087750 100644
--- a/drivers/acpi/executer/exstorob.c
+++ b/drivers/acpi/executer/exstorob.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/executer/exsystem.c b/drivers/acpi/executer/exsystem.c
index 8a88b841237d..9a3684d3cf87 100644
--- a/drivers/acpi/executer/exsystem.c
+++ b/drivers/acpi/executer/exsystem.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
@@ -129,7 +129,7 @@ acpi_status acpi_ex_system_do_stall(u32 how_long)
                  * (ACPI specifies 100 usec as max, but this gives some slack in
                  * order to support existing BIOSs)
                  */
-                ACPI_REPORT_ERROR(("Stall: Time parameter is too large (%d)\n",
+                ACPI_REPORT_ERROR(("Time parameter is too large (%d)\n",
                                    how_long));
                 status = AE_AML_OPERAND_VALUE;
         } else {
diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c
index 9f4e547d7734..990c40e0c041 100644
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/executer/exutils.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
@@ -200,9 +200,7 @@ u8 acpi_ex_acquire_global_lock(u32 field_flags)
                 if (ACPI_SUCCESS(status)) {
                         locked = TRUE;
                 } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Could not acquire Global Lock, %s\n",
-                                          acpi_format_exception(status)));
+                        ACPI_REPORT_ERROR(("Could not acquire Global Lock, %s\n", acpi_format_exception(status)));
                 }
         }