142 files changed, 658 insertions, 1023 deletions
diff --git a/drivers/acpi/dispatcher/dsfield.c b/drivers/acpi/dispatcher/dsfield.c
index 2022aeaecfbb..f3a008ff1eae 100644
--- a/drivers/acpi/dispatcher/dsfield.c
+++ b/drivers/acpi/dispatcher/dsfield.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
@@ -293,7 +293,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
                            + (acpi_integer) arg->common.value.size;
                        if (position > ACPI_UINT32_MAX) {
-                                ACPI_REPORT_ERROR(("Field [%4.4s] bit offset too large (> 0xFFFFFFFF)\n", (char *)&info->field_node->name));
+                                ACPI_REPORT_ERROR(("Field [%4.4s] bit offset too large (> 0xFFFFFFFF)\n", ACPI_CAST_PTR(char, &info->field_node->name)));
                                return_ACPI_STATUS(AE_SUPPORT);
                        }
@@ -302,9 +302,8 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
                default:
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Invalid opcode in field list: %X\n",
-                                          "Invalid opcode in field list: %X\n",
+                                           arg->common.aml_opcode));
-                                          arg->common.aml_opcode));
                        return_ACPI_STATUS(AE_AML_BAD_OPCODE);
                }
diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c
index 4fa80abfe6c0..258fbdfaa69c 100644
--- a/drivers/acpi/dispatcher/dsinit.c
+++ b/drivers/acpi/dispatcher/dsinit.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
@@ -84,7 +84,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
        acpi_object_type type;
        acpi_status status;
-        ACPI_FUNCTION_NAME("ds_init_one_object");
+        ACPI_FUNCTION_ENTRY();
        /*
         * We are only interested in NS nodes owned by the table that
@@ -105,11 +105,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
                status = acpi_ds_initialize_region(obj_handle);
                if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Region %p [%4.4s] - Init failure, %s\n", obj_handle, acpi_ut_get_node_name(obj_handle), acpi_format_exception(status)));
-                                          "Region %p [%4.4s] - Init failure, %s\n",
-                                          obj_handle,
-                                          acpi_ut_get_node_name(obj_handle),
-                                          acpi_format_exception(status)));
                }
                info->op_region_count++;
@@ -148,11 +144,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
                 */
                status = acpi_ds_parse_method(obj_handle);
                if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("\n+Method %p [%4.4s] - parse failure, %s\n", obj_handle, acpi_ut_get_node_name(obj_handle), acpi_format_exception(status)));
-                                          "\n+Method %p [%4.4s] - parse failure, %s\n",
-                                          obj_handle,
-                                          acpi_ut_get_node_name(obj_handle),
-                                          acpi_format_exception(status)));
                        /* This parse failed, but we will continue parsing more methods */
                }
@@ -214,8 +206,8 @@ acpi_ds_initialize_objects(struct acpi_table_desc * table_desc,
        status = acpi_walk_namespace(ACPI_TYPE_ANY, start_node, ACPI_UINT32_MAX,
                                     acpi_ds_init_one_object, &info, NULL);
        if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed, %s\n",
+                ACPI_REPORT_ERROR(("walk_namespace failed, %s\n",
-                                  acpi_format_exception(status)));
+                                   acpi_format_exception(status)));
        }
        ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index e7ce86b8d954..d861add3fc1f 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.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/dispatcher/dsmthdat.c b/drivers/acpi/dispatcher/dsmthdat.c
index 4095ce70982b..ce33c34f87c6 100644
--- a/drivers/acpi/dispatcher/dsmthdat.c
+++ b/drivers/acpi/dispatcher/dsmthdat.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
@@ -260,9 +260,7 @@ acpi_ds_method_data_get_node(u16 opcode,
        case AML_LOCAL_OP:
                if (index > ACPI_METHOD_MAX_LOCAL) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Local index %d is invalid (max %d)\n", index, ACPI_METHOD_MAX_LOCAL));
-                                          "Local index %d is invalid (max %d)\n",
-                                          index, ACPI_METHOD_MAX_LOCAL));
                        return_ACPI_STATUS(AE_AML_INVALID_INDEX);
                }
@@ -274,9 +272,8 @@ acpi_ds_method_data_get_node(u16 opcode,
        case AML_ARG_OP:
                if (index > ACPI_METHOD_MAX_ARG) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Arg index %d is invalid (max %d)\n",
-                                          "Arg index %d is invalid (max %d)\n",
+                                           index, ACPI_METHOD_MAX_ARG));
-                                          index, ACPI_METHOD_MAX_ARG));
                        return_ACPI_STATUS(AE_AML_INVALID_INDEX);
                }
@@ -286,8 +283,7 @@ acpi_ds_method_data_get_node(u16 opcode,
                break;
        default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Opcode %d is invalid\n",
+                ACPI_REPORT_ERROR(("Opcode %d is invalid\n", opcode));
-                                  opcode));
                return_ACPI_STATUS(AE_AML_BAD_OPCODE);
        }
@@ -378,8 +374,7 @@ acpi_ds_method_data_get_value(u16 opcode,
        /* Validate the object descriptor */
        if (!dest_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Null object descriptor pointer\n"));
-                                  "Null object descriptor pointer\n"));
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
@@ -424,23 +419,18 @@ acpi_ds_method_data_get_value(u16 opcode,
                        switch (opcode) {
                        case AML_ARG_OP:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                ACPI_REPORT_ERROR(("Uninitialized Arg[%d] at node %p\n", index, node));
-                                                  "Uninitialized Arg[%d] at node %p\n",
-                                                  index, node));
                                return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG);
                        case AML_LOCAL_OP:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                ACPI_REPORT_ERROR(("Uninitialized Local[%d] at node %p\n", index, node));
-                                                  "Uninitialized Local[%d] at node %p\n",
-                                                  index, node));
                                return_ACPI_STATUS(AE_AML_UNINITIALIZED_LOCAL);
                        default:
-                                ACPI_REPORT_ERROR(("Not Arg/Local opcode: %X\n",
+                                ACPI_REPORT_ERROR(("Not a Arg/Local opcode: %X\n", opcode));
-                                                   opcode));
                                return_ACPI_STATUS(AE_AML_INTERNAL);
                        }
        }
diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c
index 905a84e4b145..dc116d679a58 100644
--- a/drivers/acpi/dispatcher/dsobject.c
+++ b/drivers/acpi/dispatcher/dsobject.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
@@ -214,10 +214,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
        byte_list = arg->named.next;
        if (byte_list) {
                if (byte_list->common.aml_opcode != AML_INT_BYTELIST_OP) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Expecting bytelist, got AML opcode %X in op %p\n", byte_list->common.aml_opcode, byte_list));
-                                          "Expecting bytelist, got AML opcode %X in op %p\n",
-                                          byte_list->common.aml_opcode,
-                                          byte_list));
                        acpi_ut_remove_reference(obj_desc);
                        return (AE_TYPE);
@@ -543,9 +540,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                        default:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                ACPI_REPORT_ERROR(("Unknown constant opcode %X\n", opcode));
-                                                  "Unknown constant opcode %X\n",
-                                                  opcode));
                                status = AE_AML_OPERAND_TYPE;
                                break;
                        }
@@ -560,9 +555,8 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                        break;
                default:
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Unknown Integer type %X\n",
-                                          "Unknown Integer type %X\n",
+                                           op_info->type));
-                                          op_info->type));
                        status = AE_AML_OPERAND_TYPE;
                        break;
                }
@@ -640,9 +634,8 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
        default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Unimplemented data type: %X\n",
-                                  "Unimplemented data type: %X\n",
+                                   ACPI_GET_OBJECT_TYPE(obj_desc)));
-                                  ACPI_GET_OBJECT_TYPE(obj_desc)));
                status = AE_AML_OPERAND_TYPE;
                break;
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index 939d167bf87b..60414ee84b0a 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.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
@@ -413,9 +413,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
        /* Host object must be a Buffer */
        if (ACPI_GET_OBJECT_TYPE(buffer_desc) != ACPI_TYPE_BUFFER) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Target of Create Field is not a Buffer object - %s\n", acpi_ut_get_object_type_name(buffer_desc)));
-                                  "Target of Create Field is not a Buffer object - %s\n",
-                                  acpi_ut_get_object_type_name(buffer_desc)));
                status = AE_AML_OPERAND_TYPE;
                goto cleanup;
@@ -427,10 +425,9 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
         * after resolution in acpi_ex_resolve_operands().
         */
        if (ACPI_GET_DESCRIPTOR_TYPE(result_desc) != ACPI_DESC_TYPE_NAMED) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("(%s) destination not a NS Node [%s]\n",
-                                  "(%s) destination not a NS Node [%s]\n",
+                                   acpi_ps_get_opcode_name(aml_opcode),
-                                  acpi_ps_get_opcode_name(aml_opcode),
+                                   acpi_ut_get_descriptor_name(result_desc)));
-                                  acpi_ut_get_descriptor_name(result_desc)));
                status = AE_AML_OPERAND_TYPE;
                goto cleanup;
@@ -453,8 +450,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
                /* Must have a valid (>0) bit count */
                if (bit_count == 0) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Attempt to create_field of length 0\n"));
-                                          "Attempt to create_field of length 0\n"));
                        status = AE_AML_OPERAND_VALUE;
                        goto cleanup;
                }
@@ -507,9 +503,8 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
        default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Unknown field creation opcode %02x\n",
-                                  "Unknown field creation opcode %02x\n",
+                                   aml_opcode));
-                                  aml_opcode));
                status = AE_AML_BAD_OPCODE;
                goto cleanup;
        }
@@ -517,13 +512,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
        /* Entire field must fit within the current length of the buffer */
        if ((bit_offset + bit_count) > (8 * (u32) buffer_desc->buffer.length)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Field [%4.4s] size %d exceeds Buffer [%4.4s] size %d (bits)\n", acpi_ut_get_node_name(result_desc), bit_offset + bit_count, acpi_ut_get_node_name(buffer_desc->buffer.node), 8 * (u32) buffer_desc->buffer.length));
-                                  "Field [%4.4s] size %d exceeds Buffer [%4.4s] size %d (bits)\n",
-                                  acpi_ut_get_node_name(result_desc),
-                                  bit_offset + bit_count,
-                                  acpi_ut_get_node_name(buffer_desc->buffer.
-                                                        node),
-                                  8 * (u32) buffer_desc->buffer.length));
                status = AE_AML_BUFFER_LIMIT;
                goto cleanup;
        }
@@ -629,9 +618,10 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,
                           "after acpi_ex_resolve_operands");
        if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "(%s) bad operand(s) (%X)\n",
+                ACPI_REPORT_ERROR(("(%s) bad operand(s) (%X)\n",
-                                  acpi_ps_get_opcode_name(op->common.
+                                   acpi_ps_get_opcode_name(op->common.
-                                                          aml_opcode), status));
+                                                           aml_opcode),
+                                   status));
                return_ACPI_STATUS(status);
        }
@@ -1155,9 +1145,8 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
        default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Unknown control opcode=%X Op=%p\n",
-                                  "Unknown control opcode=%X Op=%p\n",
+                                   op->common.aml_opcode, op));
-                                  op->common.aml_opcode, op));
                status = AE_AML_BAD_OPCODE;
                break;
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
index 2cc53da5c0bd..cd9aa7faa57b 100644
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/dispatcher/dsutils.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
@@ -176,7 +176,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
        /* Must have both an Op and a Result Object */
        if (!op) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null Op\n"));
+                ACPI_REPORT_ERROR(("Null Op\n"));
                return_UINT8(TRUE);
        }
@@ -216,8 +216,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
        parent_info =
            acpi_ps_get_opcode_info(op->common.parent->common.aml_opcode);
        if (parent_info->class == AML_CLASS_UNKNOWN) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Unknown parent opcode Op=%p\n", op));
-                                  "Unknown parent opcode. Op=%p\n", op));
                return_UINT8(FALSE);
        }
@@ -344,7 +343,7 @@ acpi_ds_delete_result_if_not_used(union acpi_parse_object *op,
        ACPI_FUNCTION_TRACE_PTR("ds_delete_result_if_not_used", result_obj);
        if (!op) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null Op\n"));
+                ACPI_REPORT_ERROR(("Null Op\n"));
                return_VOID;
        }
@@ -635,10 +634,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                                 * Only error is underflow, and this indicates
                                 * a missing or null operand!
                                 */
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                ACPI_REPORT_ERROR(("Missing or null operand, %s\n", acpi_format_exception(status)));
-                                                  "Missing or null operand, %s\n",
-                                                  acpi_format_exception
-                                                  (status)));
                                return_ACPI_STATUS(status);
                        }
                } else {
@@ -730,7 +726,7 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,
         */
        (void)acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state);
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "While creating Arg %d - %s\n",
+        ACPI_REPORT_ERROR(("While creating Arg %d - %s\n",
-                          (arg_count + 1), acpi_format_exception(status)));
+                           (arg_count + 1), acpi_format_exception(status)));
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c
index 74f6996db2d7..5a9b91fe93d2 100644
--- a/drivers/acpi/dispatcher/dswexec.c
+++ b/drivers/acpi/dispatcher/dswexec.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
@@ -100,9 +100,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
        if (result_obj) {
                status = acpi_ds_result_pop(&obj_desc, walk_state);
                if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Could not get result from predicate evaluation, %s\n", acpi_format_exception(status)));
-                                          "Could not get result from predicate evaluation, %s\n",
-                                          acpi_format_exception(status)));
                        return_ACPI_STATUS(status);
                }
@@ -123,9 +121,8 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
        }
        if (!obj_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("No predicate obj_desc=%p State=%p\n",
-                                  "No predicate obj_desc=%p State=%p\n",
+                                   obj_desc, walk_state));
-                                  obj_desc, walk_state));
                return_ACPI_STATUS(AE_AML_NO_OPERAND);
        }
@@ -140,10 +137,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
        }
        if (ACPI_GET_OBJECT_TYPE(local_obj_desc) != ACPI_TYPE_INTEGER) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Bad predicate (not an integer) obj_desc=%p State=%p Type=%X\n", obj_desc, walk_state, ACPI_GET_OBJECT_TYPE(obj_desc)));
-                                  "Bad predicate (not an integer) obj_desc=%p State=%p Type=%X\n",
-                                  obj_desc, walk_state,
-                                  ACPI_GET_OBJECT_TYPE(obj_desc)));
                status = AE_AML_OPERAND_TYPE;
                goto cleanup;
@@ -362,8 +356,8 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
        op_class = walk_state->op_info->class;
        if (op_class == AML_CLASS_UNKNOWN) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown opcode %X\n",
+                ACPI_REPORT_ERROR(("Unknown opcode %X\n",
-                                  op->common.aml_opcode));
+                                   op->common.aml_opcode));
                return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
        }
@@ -453,12 +447,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                                walk_state->operands[1]->reference.offset)) {
                                status = AE_OK;
                        } else {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                ACPI_REPORT_ERROR(("[%s]: Could not resolve operands, %s\n", acpi_ps_get_opcode_name(walk_state->opcode), acpi_format_exception(status)));
-                                                  "[%s]: Could not resolve operands, %s\n",
-                                                  acpi_ps_get_opcode_name
-                                                  (walk_state->opcode),
-                                                  acpi_format_exception
-                                                  (status)));
                        }
                }
@@ -677,8 +666,8 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                case AML_TYPE_UNDEFINED:
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Undefined opcode type Op=%p\n",
-                                          "Undefined opcode type Op=%p\n", op));
+                                           op));
                        return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
                case AML_TYPE_BOGUS:
@@ -690,10 +679,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                default:
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p\n", op_class, op_type, op->common.aml_opcode, op));
-                                          "Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p\n",
-                                          op_class, op_type,
-                                          op->common.aml_opcode, op));
                        status = AE_NOT_IMPLEMENTED;
                        break;
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index 441931cab08a..4cad6afa82f7 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.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/dispatcher/dswscope.c b/drivers/acpi/dispatcher/dswscope.c
index defe956ef751..e7fc88ca47ba 100644
--- a/drivers/acpi/dispatcher/dswscope.c
+++ b/drivers/acpi/dispatcher/dswscope.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
@@ -107,14 +107,14 @@ acpi_ds_scope_stack_push(struct acpi_namespace_node *node,
        if (!node) {
                /* Invalid scope   */
-                ACPI_REPORT_ERROR(("ds_scope_stack_push: null scope passed\n"));
+                ACPI_REPORT_ERROR(("Null scope parameter\n"));
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
        /* Make sure object type is valid */
        if (!acpi_ut_valid_object_type(type)) {
-                ACPI_REPORT_WARNING(("ds_scope_stack_push: Invalid object type: 0x%X\n", type));
+                ACPI_REPORT_WARNING(("Invalid object type: 0x%X\n", type));
        }
        /* Allocate a new scope object */
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 7d68a5aaf3c4..61aae2dcc5e2 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -92,26 +92,23 @@ acpi_ds_result_remove(union acpi_operand_object **object,
        state = walk_state->results;
        if (!state) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("No result object pushed! State=%p\n",
-                                  "No result object pushed! State=%p\n",
+                                   walk_state));
-                                  walk_state));
                return (AE_NOT_EXIST);
        }
        if (index >= ACPI_OBJ_MAX_OPERAND) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Index out of range: %X State=%p Num=%X\n",
-                                  "Index out of range: %X State=%p Num=%X\n",
+                                   index, walk_state,
-                                  index, walk_state,
+                                   state->results.num_results));
-                                  state->results.num_results));
        }
        /* Check for a valid result object */
        if (!state->results.obj_desc[index]) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Null operand! State=%p #Ops=%X, Index=%X\n",
-                                  "Null operand! State=%p #Ops=%X, Index=%X\n",
+                                   walk_state, state->results.num_results,
-                                  walk_state, state->results.num_results,
+                                   index));
-                                  index));
                return (AE_AML_NO_RETURN_VALUE);
        }
@@ -163,9 +160,8 @@ acpi_ds_result_pop(union acpi_operand_object ** object,
        }
        if (!state->results.num_results) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Result stack is empty! State=%p\n",
-                                  "Result stack is empty! State=%p\n",
+                                   walk_state));
-                                  walk_state));
                return (AE_AML_NO_RETURN_VALUE);
        }
@@ -192,8 +188,7 @@ acpi_ds_result_pop(union acpi_operand_object ** object,
                }
        }
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+        ACPI_REPORT_ERROR(("No result objects! State=%p\n", walk_state));
-                          "No result objects! State=%p\n", walk_state));
        return (AE_AML_NO_RETURN_VALUE);
 }
@@ -222,15 +217,14 @@ acpi_ds_result_pop_from_bottom(union acpi_operand_object ** object,
        state = walk_state->results;
        if (!state) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("No result object pushed! State=%p\n",
-                                  "Warning: No result object pushed! State=%p\n",
+                                   walk_state));
-                                  walk_state));
                return (AE_NOT_EXIST);
        }
        if (!state->results.num_results) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("No result objects! State=%p\n",
-                                  "No result objects! State=%p\n", walk_state));
+                                   walk_state));
                return (AE_AML_NO_RETURN_VALUE);
        }
@@ -250,10 +244,9 @@ acpi_ds_result_pop_from_bottom(union acpi_operand_object ** object,
        /* Check for a valid result object */
        if (!*object) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Null operand! State=%p #Ops=%X Index=%X\n",
-                                  "Null operand! State=%p #Ops=%X Index=%X\n",
+                                   walk_state, state->results.num_results,
-                                  walk_state, state->results.num_results,
+                                   (u32) index));
-                                  (u32) index));
                return (AE_AML_NO_RETURN_VALUE);
        }
@@ -293,18 +286,14 @@ acpi_ds_result_push(union acpi_operand_object * object,
        }
        if (state->results.num_results == ACPI_OBJ_NUM_OPERANDS) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Result stack overflow: Obj=%p State=%p Num=%X\n", object, walk_state, state->results.num_results));
-                                  "Result stack overflow: Obj=%p State=%p Num=%X\n",
-                                  object, walk_state,
-                                  state->results.num_results));
                return (AE_STACK_OVERFLOW);
        }
        if (!object) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Null Object! Obj=%p State=%p Num=%X\n",
-                                  "Null Object! Obj=%p State=%p Num=%X\n",
+                                   object, walk_state,
-                                  object, walk_state,
+                                   state->results.num_results));
-                                  state->results.num_results));
                return (AE_BAD_PARAMETER);
        }
@@ -413,10 +402,7 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
        /* Check for stack overflow */
        if (walk_state->num_operands >= ACPI_OBJ_NUM_OPERANDS) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Object stack overflow! Obj=%p State=%p #Ops=%X\n", object, walk_state, walk_state->num_operands));
-                                  "overflow! Obj=%p State=%p #Ops=%X\n",
-                                  object, walk_state,
-                                  walk_state->num_operands));
                return (AE_STACK_OVERFLOW);
        }
@@ -460,10 +446,7 @@ acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state * walk_state)
                /* Check for stack underflow */
                if (walk_state->num_operands == 0) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Object stack underflow! Count=%X State=%p #Ops=%X\n", pop_count, walk_state, walk_state->num_operands));
-                                          "Underflow! Count=%X State=%p #Ops=%X\n",
-                                          pop_count, walk_state,
-                                          walk_state->num_operands));
                        return (AE_STACK_UNDERFLOW);
                }
@@ -506,10 +489,7 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
                /* Check for stack underflow */
                if (walk_state->num_operands == 0) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Object stack underflow! Count=%X State=%p #Ops=%X\n", pop_count, walk_state, walk_state->num_operands));
-                                          "Underflow! Count=%X State=%p #Ops=%X\n",
-                                          pop_count, walk_state,
-                                          walk_state->num_operands));
                        return (AE_STACK_UNDERFLOW);
                }
@@ -826,16 +806,14 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)
        }
        if (walk_state->data_type != ACPI_DESC_TYPE_WALK) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("%p is not a valid walk state\n",
-                                  "%p is not a valid walk state\n",
+                                   walk_state));
-                                  walk_state));
                return;
        }
        if (walk_state->parser_state.scope) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("%p walk still has a scope list\n",
-                                  "%p walk still has a scope list\n",
+                                   walk_state));
-                                  walk_state));
        }
        /* Always must free any linked control states */
@@ -894,25 +872,18 @@ acpi_ds_result_insert(void *object,
        state = walk_state->results;
        if (!state) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("No result object pushed! State=%p\n",
-                                  "No result object pushed! State=%p\n",
+                                   walk_state));
-                                  walk_state));
                return (AE_NOT_EXIST);
        }
        if (index >= ACPI_OBJ_NUM_OPERANDS) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Index out of range: %X Obj=%p State=%p Num=%X\n", index, object, walk_state, state->results.num_results));
-                                  "Index out of range: %X Obj=%p State=%p Num=%X\n",
-                                  index, object, walk_state,
-                                  state->results.num_results));
                return (AE_BAD_PARAMETER);
        }
        if (!object) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Null Object! Index=%X Obj=%p State=%p Num=%X\n", index, object, walk_state, state->results.num_results));
-                                  "Null Object! Index=%X Obj=%p State=%p Num=%X\n",
-                                  index, object, walk_state,
-                                  state->results.num_results));
                return (AE_BAD_PARAMETER);
        }
@@ -986,9 +957,7 @@ acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
        /* Check for stack underflow */
        if (walk_state->num_operands == 0) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Missing operand/stack empty! State=%p #Ops=%X\n", walk_state, walk_state->num_operands));
-                                  "Missing operand/stack empty! State=%p #Ops=%X\n",
-                                  walk_state, walk_state->num_operands));
                *object = NULL;
                return (AE_AML_NO_OPERAND);
        }
@@ -1000,9 +969,8 @@ acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
        /* Check for a valid operand */
        if (!walk_state->operands[walk_state->num_operands]) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Null operand! State=%p #Ops=%X\n",
-                                  "Null operand! State=%p #Ops=%X\n",
+                                   walk_state, walk_state->num_operands));
-                                  walk_state, walk_state->num_operands));
                *object = NULL;
                return (AE_AML_NO_OPERAND);
        }
diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c
index 9522c643b88b..b380ae1044b7 100644
--- a/drivers/acpi/events/evevent.c
+++ b/drivers/acpi/events/evevent.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
@@ -73,7 +73,7 @@ acpi_status acpi_ev_initialize_events(void)
        /* Make sure we have ACPI tables */
        if (!acpi_gbl_DSDT) {
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN, "No ACPI tables present!\n"));
+                ACPI_REPORT_WARNING(("No ACPI tables present!\n"));
                return_ACPI_STATUS(AE_NO_ACPI_TABLES);
        }
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index bdd86537738e..353b907edbfa 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.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
@@ -599,7 +599,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
            ACPI_GPE_EDGE_TRIGGERED) {
                status = acpi_hw_clear_gpe(gpe_event_info);
                if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number));
+                        ACPI_REPORT_ERROR(("%s, Unable to clear GPE[%2X]\n",
+                                           acpi_format_exception(status),
+                                           gpe_number));
                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                }
        }
@@ -637,7 +639,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                    ACPI_GPE_LEVEL_TRIGGERED) {
                        status = acpi_hw_clear_gpe(gpe_event_info);
                        if (ACPI_FAILURE(status)) {
-                                ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number));
+                                ACPI_REPORT_ERROR(("%s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number));
                                return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                        }
                }
@@ -651,7 +653,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                 */
                status = acpi_ev_disable_gpe(gpe_event_info);
                if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to disable GPE[%2X]\n", acpi_format_exception(status), gpe_number));
+                        ACPI_REPORT_ERROR(("%s, Unable to disable GPE[%2X]\n",
+                                           acpi_format_exception(status),
+                                           gpe_number));
                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                }
@@ -663,7 +667,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                                                     acpi_ev_asynch_execute_gpe_method,
                                                     gpe_event_info);
                if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to queue handler for GPE[%2X] - event disabled\n", acpi_format_exception(status), gpe_number));
+                        ACPI_REPORT_ERROR(("%s, Unable to queue handler for GPE[%2X] - event disabled\n", acpi_format_exception(status), gpe_number));
                }
                break;
@@ -671,7 +675,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                /* No handler or method to run! */
-                ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: No handler or method for GPE[%2X], disabling event\n", gpe_number));
+                ACPI_REPORT_ERROR(("No handler or method for GPE[%2X], disabling event\n", gpe_number));
                /*
                 * Disable the GPE.  The GPE will remain disabled until the ACPI
@@ -679,7 +683,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                 */
                status = acpi_ev_disable_gpe(gpe_event_info);
                if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to disable GPE[%2X]\n", acpi_format_exception(status), gpe_number));
+                        ACPI_REPORT_ERROR(("%s, Unable to disable GPE[%2X]\n",
+                                           acpi_format_exception(status),
+                                           gpe_number));
                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                }
                break;
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index 8efca2eac27e..3b9bbdda551d 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.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
@@ -279,9 +279,7 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
        default:
                /* Unknown method type, just ignore it! */
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Unknown GPE method type: %s (name not of form _Lxx or _Exx)\n", name));
-                                  "Unknown GPE method type: %s (name not of form _Lxx or _Exx)\n",
-                                  name));
                return_ACPI_STATUS(AE_OK);
        }
@@ -291,9 +289,7 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
        if (gpe_number == ACPI_UINT32_MAX) {
                /* Conversion failed; invalid method, just ignore it */
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)\n", name));
-                                  "Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)\n",
-                                  name));
                return_ACPI_STATUS(AE_OK);
        }
@@ -527,9 +523,7 @@ static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32
                                                           acpi_ev_gpe_xrupt_handler,
                                                           gpe_xrupt);
                if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Could not install GPE interrupt handler at level 0x%X\n", interrupt_number));
-                                          "Could not install GPE interrupt handler at level 0x%X\n",
-                                          interrupt_number));
                        return_PTR(NULL);
                }
        }
@@ -745,8 +739,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
                                               sizeof(struct
                                                      acpi_gpe_register_info));
        if (!gpe_register_info) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Could not allocate the gpe_register_info table\n"));
-                                  "Could not allocate the gpe_register_info table\n"));
                return_ACPI_STATUS(AE_NO_MEMORY);
        }
@@ -759,8 +752,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
                                             ACPI_GPE_REGISTER_WIDTH) *
                                            sizeof(struct acpi_gpe_event_info));
        if (!gpe_event_info) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Could not allocate the gpe_event_info table\n"));
-                                  "Could not allocate the gpe_event_info table\n"));
                status = AE_NO_MEMORY;
                goto error_exit;
        }
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index 7e57b8470f55..78883239784a 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.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
@@ -542,9 +542,7 @@ void acpi_ev_terminate(void)
                for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) {
                        status = acpi_disable_event((u32) i, 0);
                        if (ACPI_FAILURE(status)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                ACPI_REPORT_ERROR(("Could not disable fixed event %d\n", (u32) i));
-                                                  "Could not disable fixed event %d\n",
-                                                  (u32) i));
                        }
                }
@@ -556,8 +554,7 @@ void acpi_ev_terminate(void)
                status = acpi_ev_remove_sci_handler();
                if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Could not remove SCI handler\n"));
-                                          "Could not remove SCI handler\n"));
                }
        }
@@ -570,8 +567,7 @@ void acpi_ev_terminate(void)
        if (acpi_gbl_original_mode == ACPI_SYS_MODE_LEGACY) {
                status = acpi_disable();
                if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_WARN,
+                        ACPI_REPORT_WARNING(("acpi_disable failed\n"));
-                                          "acpi_disable failed\n"));
                }
        }
        return_VOID;
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 84fad082d80d..900e5b32e595 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.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
@@ -295,12 +295,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
        handler_desc = region_obj->region.handler;
        if (!handler_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("No handler for Region [%4.4s] (%p) [%s]\n",
-                                  "No handler for Region [%4.4s] (%p) [%s]\n",
+                                   acpi_ut_get_node_name(region_obj->region.
-                                  acpi_ut_get_node_name(region_obj->region.
+                                                         node), region_obj,
-                                                        node), region_obj,
+                                   acpi_ut_get_region_name(region_obj->region.
-                                  acpi_ut_get_region_name(region_obj->region.
+                                                           space_id)));
-                                                          space_id)));
                return_ACPI_STATUS(AE_NOT_EXIST);
        }
@@ -317,12 +316,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                if (!region_setup) {
                        /* No initialization routine, exit with error */
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("No init routine for region(%p) [%s]\n", region_obj, acpi_ut_get_region_name(region_obj->region.space_id)));
-                                          "No init routine for region(%p) [%s]\n",
-                                          region_obj,
-                                          acpi_ut_get_region_name(region_obj->
-                                                                  region.
-                                                                  space_id)));
                        return_ACPI_STATUS(AE_NOT_EXIST);
                }
@@ -347,12 +341,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                /* Check for failure of the Region Setup */
                if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Region Initialization: %s [%s]\n",
-                                          "Region Init: %s [%s]\n",
+                                           acpi_format_exception(status),
-                                          acpi_format_exception(status),
+                                           acpi_ut_get_region_name(region_obj->
-                                          acpi_ut_get_region_name(region_obj->
+                                                                   region.
-                                                                  region.
+                                                                   space_id)));
-                                                                  space_id)));
                        return_ACPI_STATUS(status);
                }
@@ -501,12 +494,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
                        status = acpi_ev_execute_reg_method(region_obj, 0);
                        if (ACPI_FAILURE(status)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                ACPI_REPORT_ERROR(("%s from region _REG, [%s]\n", acpi_format_exception(status), acpi_ut_get_region_name(region_obj->region.space_id)));
-                                                  "%s from region _REG, [%s]\n",
-                                                  acpi_format_exception(status),
-                                                  acpi_ut_get_region_name
-                                                  (region_obj->region.
-                                                   space_id)));
                        }
                        if (acpi_ns_is_locked) {
@@ -528,12 +516,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
                        /* Init routine may fail, Just ignore errors */
                        if (ACPI_FAILURE(status)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                ACPI_REPORT_ERROR(("%s from region init, [%s]\n", acpi_format_exception(status), acpi_ut_get_region_name(region_obj->region.space_id)));
-                                                  "%s from region init, [%s]\n",
-                                                  acpi_format_exception(status),
-                                                  acpi_ut_get_region_name
-                                                  (region_obj->region.
-                                                   space_id)));
                        }
                        region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index a1bd2da27c45..de1a38e9ce22 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.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/events/evsci.c b/drivers/acpi/events/evsci.c
index e2c0b48a7e9f..9a622169008a 100644
--- a/drivers/acpi/events/evsci.c
+++ b/drivers/acpi/events/evsci.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/events/evxface.c b/drivers/acpi/events/evxface.c
index 57d73299298e..b2f69b1ac4b5 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.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
@@ -143,8 +143,8 @@ acpi_install_fixed_event_handler(u32 event,
        if (ACPI_SUCCESS(status))
                status = acpi_enable_event(event, 0);
        if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
+                ACPI_REPORT_WARNING(("Could not enable fixed event %X\n",
-                                  "Could not enable fixed event.\n"));
+                                     event));
                /* Remove the handler */
@@ -204,10 +204,9 @@ acpi_remove_fixed_event_handler(u32 event, acpi_event_handler handler)
        acpi_gbl_fixed_event_handlers[event].context = NULL;
        if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
+                ACPI_REPORT_WARNING(("Could not write to fixed event enable register %X\n", event));
-                                  "Could not write to fixed event enable register.\n"));
        } else {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X.\n",
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X\n",
                                  event));
        }
@@ -434,7 +433,7 @@ acpi_remove_notify_handler(acpi_handle device,
        if (device == ACPI_ROOT_OBJECT) {
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Removing notify handler for ROOT object.\n"));
+                                  "Removing notify handler for namespace root object\n"));
                if (((handler_type & ACPI_SYSTEM_NOTIFY) &&
                     !acpi_gbl_system_notify.handler) ||
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c
index c1b898928256..90eb7939e986 100644
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/events/evxfevnt.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
@@ -70,8 +70,7 @@ acpi_status acpi_enable(void)
        /* Make sure we have the FADT */
        if (!acpi_gbl_FADT) {
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
+                ACPI_REPORT_WARNING(("No FADT information present!\n"));
-                                  "No FADT information present!\n"));
                return_ACPI_STATUS(AE_NO_ACPI_TABLES);
        }
@@ -83,7 +82,7 @@ acpi_status acpi_enable(void)
                status = acpi_hw_set_mode(ACPI_SYS_MODE_ACPI);
                if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("Could not transition to ACPI mode.\n"));
+                        ACPI_REPORT_ERROR(("Could not transition to ACPI mode\n"));
                        return_ACPI_STATUS(status);
                }
@@ -113,8 +112,7 @@ acpi_status acpi_disable(void)
        ACPI_FUNCTION_TRACE("acpi_disable");
        if (!acpi_gbl_FADT) {
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
+                ACPI_REPORT_WARNING(("No FADT information present!\n"));
-                                  "No FADT information present!\n"));
                return_ACPI_STATUS(AE_NO_ACPI_TABLES);
        }
@@ -127,8 +125,7 @@ acpi_status acpi_disable(void)
                status = acpi_hw_set_mode(ACPI_SYS_MODE_LEGACY);
                if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Could not exit ACPI mode to legacy mode"));
-                                          "Could not exit ACPI mode to legacy mode"));
                        return_ACPI_STATUS(status);
                }
@@ -185,9 +182,8 @@ acpi_status acpi_enable_event(u32 event, u32 flags)
        }
        if (value != 1) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Could not enable %s event\n",
-                                  "Could not enable %s event\n",
+                                   acpi_ut_get_event_name(event)));
-                                  acpi_ut_get_event_name(event)));
                return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
        }
@@ -384,9 +380,8 @@ acpi_status acpi_disable_event(u32 event, u32 flags)
        }
        if (value != 0) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Could not disable %s events\n",
-                                  "Could not disable %s events\n",
+                                   acpi_ut_get_event_name(event)));
-                                  acpi_ut_get_event_name(event)));
                return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
        }
diff --git a/drivers/acpi/events/evxfregn.c b/drivers/acpi/events/evxfregn.c
index 6f28ea2db5ba..abf5caca9ae5 100644
--- a/drivers/acpi/events/evxfregn.c
+++ b/drivers/acpi/events/evxfregn.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/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,
+                ACPI_REPORT_ERROR(("Table has invalid signature [%4.4s], must be SSDT or PSDT\n", table_ptr->signature));
-                                  "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,
+                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)));
-                                  "Unknown Target type ID 0x%X Op %s dest_type %s\n",
+                status = AE_AML_INTERNAL;
-                                  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;
        }
        /*
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,
+                ACPI_REPORT_ERROR(("Needed Region, found type %X (%s)\n",
-                                  "Needed Region, found type %X (%s)\n",
+                                   ACPI_GET_OBJECT_TYPE(rgn_desc),
-                                  ACPI_GET_OBJECT_TYPE(rgn_desc),
+                                   acpi_ut_get_object_type_name(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,
+                        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));
-                                          "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,
+                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));
-                                  "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,
+                        ACPI_REPORT_ERROR(("Region %s(%X) not implemented\n",
-                                          "Region %s(%X) not implemented\n",
+                                           acpi_ut_get_region_name(rgn_desc->
-                                          acpi_ut_get_region_name(rgn_desc->
+                                                                   region.
-                                                                  region.
+                                                                   space_id),
-                                                                  space_id),
+                                           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,
+                        ACPI_REPORT_ERROR(("Unknown update_rule value: %X\n",
-                                          "write_with_update_rule: Unknown update_rule setting: %X\n",
+                                           (obj_desc->common_field.
-                                          (obj_desc->common_field.
+                                            field_flags &
-                                           field_flags &
+                                            AML_FIELD_UPDATE_RULE_MASK)));
-                                           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,
+                ACPI_REPORT_ERROR(("Field size %X (bits) is too large for buffer (%X)\n", obj_desc->common_field.bit_length, buffer_length));
-                                  "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,
+                ACPI_REPORT_ERROR(("Field size %X (bits) is too large for buffer (%X)\n", obj_desc->common_field.bit_length, buffer_length));
-                                  "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",
+                ACPI_REPORT_ERROR(("Invalid leading digit: %c\n", char_buf[0]));
-                                  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,
+                ACPI_REPORT_ERROR(("Bad character %02x in name, at %p\n",
-                                  "Bad character %02x in name, at %p\n",
+                                   *aml_address, aml_address));
-                                  *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",
+                ACPI_REPORT_ERROR(("Malformed Name at %p\n", name_string));
-                                   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,
+                                        ACPI_REPORT_ERROR(("BCD digit too large (not decimal): 0x%X\n", temp32));
-                                                          "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,
+                                ACPI_REPORT_ERROR(("Integer too large to convert to BCD: %8.8X%8.8X\n", ACPI_FORMAT_UINT64(operand[0]->integer.value)));
-                                                  "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,
+                ACPI_REPORT_ERROR(("%s is obsolete and not implemented\n",
-                                  "%s is obsolete and not implemented\n",
+                                   acpi_ps_get_opcode_name(walk_state->
-                                  acpi_ps_get_opcode_name(walk_state->opcode)));
+                                                           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,
+                        ACPI_REPORT_ERROR(("%s: bad operand(s) %s\n",
-                                          "%s: bad operand(s) %s\n",
+                                           acpi_ps_get_opcode_name(walk_state->
-                                          acpi_ps_get_opcode_name(walk_state->
+                                                                   opcode),
-                                                                  opcode),
+                                           acpi_format_exception(status)));
-                                          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,
+                        ACPI_REPORT_ERROR(("Operand is not Buf/Int/Str/Pkg - found type %s\n", acpi_ut_get_type_name(type)));
-                                          "size_of - 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,
+                                        ACPI_REPORT_ERROR(("Unknown Index target_type %X in obj %p\n", operand[0]->reference.target_type, operand[0]));
-                                                          "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,
+                                ACPI_REPORT_ERROR(("Unknown opcode in ref(%p) - %X\n", operand[0], operand[0]->reference.opcode));
-                                                  "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,
+                        ACPI_REPORT_ERROR(("Unexpected notify object type [%s]\n", acpi_ut_get_type_name(node->type)));
-                                          "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,
+                                ACPI_REPORT_ERROR(("Index value (%X%8.8X) beyond package end (%X)\n", ACPI_FORMAT_UINT64(index), operand[0]->package.count));
-                                                  "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,
+                                ACPI_REPORT_ERROR(("Index value (%X%8.8X) beyond end of buffer (%X)\n", ACPI_FORMAT_UINT64(index), operand[0]->buffer.length));
-                                                  "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,
+                        ACPI_REPORT_ERROR(("Match operator out of range\n"));
-                                          "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,
+                        ACPI_REPORT_ERROR(("Index (%X%8.8X) beyond package end (%X)\n", ACPI_FORMAT_UINT64(index), operand[0]->package.count));
-                                          "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,
+                ACPI_REPORT_ERROR(("Unknown field access type %X\n", access));
-                                  "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,
+                        ACPI_REPORT_ERROR(("Needed Region, found type %X (%s)\n", type, acpi_ut_get_type_name(type)));
-                                          "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,
+                ACPI_REPORT_ERROR(("Invalid system_memory width %d\n",
-                                  "Invalid system_memory width %d\n",
+                                   bit_width));
-                                  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,
+                        ACPI_REPORT_ERROR(("Could not map memory at %8.8X%8.8X, size %X\n", ACPI_FORMAT_UINT64(address), (u32) window_size));
-                                          "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,
+                ACPI_REPORT_ERROR(("No object attached to node %p\n", node));
-                                  "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,
+                        ACPI_REPORT_ERROR(("Object not a Package, type %s\n",
-                                          "Object not a Package, type %s\n",
+                                           acpi_ut_get_object_type_name
-                                          acpi_ut_get_object_type_name
+                                           (source_desc)));
-                                          (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,
+                        ACPI_REPORT_ERROR(("Object not a Buffer, type %s\n",
-                                          "Object not a Buffer, type %s\n",
+                                           acpi_ut_get_object_type_name
-                                          acpi_ut_get_object_type_name
+                                           (source_desc)));
-                                          (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,
+                        ACPI_REPORT_ERROR(("Object not a String, type %s\n",
-                                          "Object not a String, type %s\n",
+                                           acpi_ut_get_object_type_name
-                                          acpi_ut_get_object_type_name
+                                           (source_desc)));
-                                          (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,
+                        ACPI_REPORT_ERROR(("Object not a Integer, type %s\n",
-                                          "Object not a Integer, type %s\n",
+                                           acpi_ut_get_object_type_name
-                                          acpi_ut_get_object_type_name
+                                           (source_desc)));
-                                          (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,
+                ACPI_REPORT_ERROR(("Untyped entry %p, no attached object!\n",
-                                  "Untyped entry %p, no attached object!\n",
+                                   node));
-                                  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,
+                        ACPI_REPORT_ERROR(("Unsupported Reference opcode %X (%s)\n", source_desc->reference.opcode, acpi_ps_get_opcode_name(source_desc->reference.opcode)));
-                                          "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,
+                ACPI_REPORT_ERROR(("Node %p - Unknown object type %X\n",
-                                  "Node %p - Unknown object type %X\n",
+                                   node, entry_type));
-                                  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,
+                        ACPI_REPORT_ERROR(("Internal - null pointer\n"));
-                                          "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,
+                                        ACPI_REPORT_ERROR(("Attempt to deref an Index to NULL pkg element Idx=%p\n", stack_desc));
-                                                          "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,
+                ACPI_REPORT_ERROR(("Needed type [%s], found [%s] %p\n",
-                                  "Needed [%s], found [%s] %p\n",
+                                   acpi_ut_get_type_name(type_needed),
-                                  acpi_ut_get_type_name(type_needed),
+                                   acpi_ut_get_type_name(this_type), object));
-                                  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,
+                                ACPI_REPORT_ERROR(("Bad operand object type [%X]\n", object_type));
-                                                  "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,
+                                        ACPI_REPORT_ERROR(("Operand is a Reference, Unknown Reference Opcode: %X\n", obj_desc->reference.opcode));
-                                                          "Operand is a Reference, Unknown Reference Opcode %X [%s]\n",
-                                                          obj_desc->reference.
-                                                          opcode,
-                                                          (acpi_ps_get_opcode_info
-                                                           (obj_desc->reference.
-                                                            opcode))->name));
                                        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,
+                        ACPI_REPORT_ERROR(("Invalid descriptor %p [%s]\n",
-                                          "Invalid descriptor %p [%s]\n",
+                                           obj_desc,
-                                          obj_desc,
+                                           acpi_ut_get_descriptor_name
-                                          acpi_ut_get_descriptor_name
+                                           (obj_desc)));
-                                          (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,
+                                        ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
-                                                          "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,
+                                        ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
-                                                          "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,
+                                        ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
-                                                          "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,
+                                ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
-                                                  "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,
+                                ACPI_REPORT_ERROR(("Needed [Integer/String/Buffer], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
-                                                  "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,
+                                ACPI_REPORT_ERROR(("Needed [Buffer/String/Package/Reference], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
-                                                  "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,
+                                ACPI_REPORT_ERROR(("Needed [Buffer/String/Package], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
-                                                  "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,
+                                ACPI_REPORT_ERROR(("Needed [Region/region_field], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
-                                                  "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,
+                                ACPI_REPORT_ERROR(("Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p\n", acpi_ut_get_object_type_name(obj_desc), obj_desc));
-                                                  "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,
+                        ACPI_REPORT_ERROR(("Internal - Unknown ARGI (required operand) type %X\n", this_arg_type));
-                                          "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,
+                ACPI_REPORT_ERROR(("Target is not a Reference or Constant object - %s [%p]\n", acpi_ut_get_object_type_name(dest_desc), dest_desc));
-                                  "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,
+                        ACPI_REPORT_ERROR(("Source must be Integer/Buffer/String type, not %s\n", acpi_ut_get_object_type_name(source_desc)));
-                                          "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,
+                ACPI_REPORT_ERROR(("Target is not a Package or buffer_field\n"));
-                                  "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,
+                        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)));
-                                          "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,
+                ACPI_REPORT_WARNING(("Store into type %s not implemented\n",
-                                  "Store into type %s not implemented\n",
+                                     acpi_ut_get_object_type_name(dest_desc)));
-                                  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,
+                        ACPI_REPORT_ERROR(("Could not acquire Global Lock, %s\n", acpi_format_exception(status)));
-                                          "Could not acquire Global Lock, %s\n",
-                                          acpi_format_exception(status)));
                }
        }
diff --git a/drivers/acpi/hardware/hwacpi.c b/drivers/acpi/hardware/hwacpi.c
index 20a335cc9bea..5c068cc4f674 100644
--- a/drivers/acpi/hardware/hwacpi.c
+++ b/drivers/acpi/hardware/hwacpi.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
@@ -68,8 +68,7 @@ acpi_status acpi_hw_initialize(void)
        /* We must have the ACPI tables by the time we get here */
        if (!acpi_gbl_FADT) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "No FADT is present\n"));
+                ACPI_REPORT_ERROR(("No FADT is present\n"));
                return_ACPI_STATUS(AE_NO_ACPI_TABLES);
        }
@@ -108,7 +107,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
         * system does not support mode transition.
         */
        if (!acpi_gbl_FADT->smi_cmd) {
-                ACPI_REPORT_ERROR(("No SMI_CMD in FADT, mode transition failed.\n"));
+                ACPI_REPORT_ERROR(("No SMI_CMD in FADT, mode transition failed\n"));
                return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
        }
diff --git a/drivers/acpi/hardware/hwgpe.c b/drivers/acpi/hardware/hwgpe.c
index 5c8e5dfd024e..d84942d22dd5 100644
--- a/drivers/acpi/hardware/hwgpe.c
+++ b/drivers/acpi/hardware/hwgpe.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/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c
index b243f20708b7..b4b50a3d1705 100644
--- a/drivers/acpi/hardware/hwregs.c
+++ b/drivers/acpi/hardware/hwregs.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
@@ -202,12 +202,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
        }
        if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("%s While evaluating sleep_state [%s], bad Sleep object %p type %s\n", acpi_format_exception(status), sleep_state_name, info.return_object, acpi_ut_get_object_type_name(info.return_object)));
-                                  "%s While evaluating sleep_state [%s], bad Sleep object %p type %s\n",
-                                  acpi_format_exception(status),
-                                  sleep_state_name, info.return_object,
-                                  acpi_ut_get_object_type_name(info.
-                                                               return_object)));
        }
        acpi_ut_remove_reference(info.return_object);
@@ -230,12 +225,11 @@ EXPORT_SYMBOL(acpi_get_sleep_type_data);
 struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id)
 {
-        ACPI_FUNCTION_NAME("hw_get_bit_register_info");
+        ACPI_FUNCTION_ENTRY();
        if (register_id > ACPI_BITREG_MAX) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Invalid bit_register ID: %X\n",
-                                  "Invalid bit_register ID: %X\n",
+                                   register_id));
-                                  register_id));
                return (NULL);
        }
@@ -570,8 +564,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
                break;
        default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown Register ID: %X\n",
+                ACPI_REPORT_ERROR(("Unknown Register ID: %X\n", register_id));
-                                  register_id));
                status = AE_BAD_PARAMETER;
                break;
        }
@@ -766,9 +759,8 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)
                break;
        default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Unsupported address space: %X\n",
-                                  "Unsupported address space: %X\n",
+                                   reg->address_space_id));
-                                  reg->address_space_id));
                return (AE_BAD_PARAMETER);
        }
@@ -837,9 +829,8 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)
                break;
        default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Unsupported address space: %X\n",
-                                  "Unsupported address space: %X\n",
+                                   reg->address_space_id));
-                                  reg->address_space_id));
                return (AE_BAD_PARAMETER);
        }
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 34519069050c..992128d71117 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.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/hardware/hwtimer.c b/drivers/acpi/hardware/hwtimer.c
index aff6dc141784..fc10b7cb456f 100644
--- a/drivers/acpi/hardware/hwtimer.c
+++ b/drivers/acpi/hardware/hwtimer.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index 6923059ba3c7..c2db93e25b78 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -110,10 +110,7 @@ acpi_status acpi_ns_root_initialize(void)
                                        ACPI_NS_NO_UPSEARCH, NULL, &new_node);
                if (ACPI_FAILURE(status) || (!new_node)) {      /* Must be on same line for code converter */
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Could not create predefined name %s, %s\n", init_val->name, acpi_format_exception(status)));
-                                          "Could not create predefined name %s, %s\n",
-                                          init_val->name,
-                                          acpi_format_exception(status)));
                }
                /*
@@ -124,9 +121,7 @@ acpi_status acpi_ns_root_initialize(void)
                if (init_val->val) {
                        status = acpi_os_predefined_override(init_val, &val);
                        if (ACPI_FAILURE(status)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                ACPI_REPORT_ERROR(("Could not override predefined %s\n", init_val->name));
-                                                  "Could not override predefined %s\n",
-                                                  init_val->name));
                        }
                        if (!val) {
@@ -339,7 +334,10 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                prefix_node = scope_info->scope.node;
                if (ACPI_GET_DESCRIPTOR_TYPE(prefix_node) !=
                    ACPI_DESC_TYPE_NAMED) {
-                        ACPI_REPORT_ERROR(("ns_lookup: %p is not a namespace node [%s]\n", prefix_node, acpi_ut_get_descriptor_name(prefix_node)));
+                        ACPI_REPORT_ERROR(("%p is not a namespace node [%s]\n",
+                                           prefix_node,
+                                           acpi_ut_get_descriptor_name
+                                           (prefix_node)));
                        return_ACPI_STATUS(AE_AML_INTERNAL);
                }
@@ -600,7 +598,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                    (this_node->type != type_to_check_for)) {
                        /* Complain about a type mismatch */
-                        ACPI_REPORT_WARNING(("ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)\n", (char *)&simple_name, acpi_ut_get_type_name(this_node->type), acpi_ut_get_type_name(type_to_check_for)));
+                        ACPI_REPORT_WARNING(("ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)\n", ACPI_CAST_PTR(char, &simple_name), acpi_ut_get_type_name(this_node->type), acpi_ut_get_type_name(type_to_check_for)));
                }
                /*
diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c
index cc7a85f8cfe6..3db950f5d5a0 100644
--- a/drivers/acpi/namespace/nsalloc.c
+++ b/drivers/acpi/namespace/nsalloc.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -272,9 +272,8 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
                /* Grandchildren should have all been deleted already */
                if (child_node->child) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Found a grandchild! P=%p C=%p\n",
-                                          "Found a grandchild! P=%p C=%p\n",
+                                           parent_node, child_node));
-                                          parent_node, child_node));
                }
                /* Now we can free this child object */
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 864c642759fa..2f0b70e3e881 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -198,7 +198,8 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                /* Check the node type and name */
                if (type > ACPI_TYPE_LOCAL_MAX) {
-                        ACPI_REPORT_WARNING(("Invalid ACPI Type %08X\n", type));
+                        ACPI_REPORT_WARNING(("Invalid ACPI Object Type %08X\n",
+                                             type));
                }
                if (!acpi_ut_valid_acpi_name(this_node->name.integer)) {
diff --git a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/namespace/nsdumpdv.c
index 55de883943d6..aff899a935e3 100644
--- a/drivers/acpi/namespace/nsdumpdv.c
+++ b/drivers/acpi/namespace/nsdumpdv.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c
index 0191c7d92824..e3c667072e2f 100644
--- a/drivers/acpi/namespace/nseval.c
+++ b/drivers/acpi/namespace/nseval.c
@@ -6,7 +6,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -373,8 +373,7 @@ acpi_ns_execute_control_method(struct acpi_parameter_info *info)
        info->obj_desc = acpi_ns_get_attached_object(info->node);
        if (!info->obj_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("No attached method object\n"));
-                                  "No attached method object\n"));
                (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
                return_ACPI_STATUS(AE_NULL_OBJECT);
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index efa3f4233736..6c117893f301 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -93,8 +93,8 @@ acpi_status acpi_ns_initialize_objects(void)
                                     ACPI_UINT32_MAX, acpi_ns_init_one_object,
                                     &info, NULL);
        if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed! %s\n",
+                ACPI_REPORT_ERROR(("walk_namespace failed! %s\n",
-                                  acpi_format_exception(status)));
+                                   acpi_format_exception(status)));
        }
        ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
@@ -159,8 +159,8 @@ acpi_status acpi_ns_initialize_devices(void)
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed! %s\n",
+                ACPI_REPORT_ERROR(("walk_namespace failed! %s\n",
-                                  acpi_format_exception(status)));
+                                   acpi_format_exception(status)));
        }
        ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
@@ -289,12 +289,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
        }
        if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_ERROR, "\n"));
+                ACPI_REPORT_ERROR(("\nCould not execute arguments for [%4.4s] (%s), %s\n", acpi_ut_get_node_name(node), acpi_ut_get_type_name(type), acpi_format_exception(status)));
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Could not execute arguments for [%4.4s] (%s), %s\n",
-                                  acpi_ut_get_node_name(node),
-                                  acpi_ut_get_type_name(type),
-                                  acpi_format_exception(status)));
        }
        /*
@@ -421,8 +416,9 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
 #ifdef ACPI_DEBUG_OUTPUT
                char *scope_name = acpi_ns_get_external_pathname(ini_node);
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN, "%s._INI failed: %s\n",
+                ACPI_REPORT_WARNING(("%s._INI failed: %s\n",
-                                  scope_name, acpi_format_exception(status)));
+                                     scope_name,
+                                     acpi_format_exception(status)));
                ACPI_MEM_FREE(scope_name);
 #endif
diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c
index c28849de465a..0b4a866ef5aa 100644
--- a/drivers/acpi/namespace/nsload.c
+++ b/drivers/acpi/namespace/nsload.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -92,7 +92,7 @@ acpi_ns_load_table(struct acpi_table_desc *table_desc,
        /* Check validity of the AML start and length */
        if (!table_desc->aml_start) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null AML pointer\n"));
+                ACPI_REPORT_ERROR(("Null AML pointer\n"));
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
@@ -263,7 +263,7 @@ acpi_status acpi_ns_load_namespace(void)
        /* There must be at least a DSDT installed */
        if (acpi_gbl_DSDT == NULL) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "DSDT is not in memory\n"));
+                ACPI_REPORT_ERROR(("DSDT is not in memory\n"));
                return_ACPI_STATUS(AE_NO_ACPI_TABLES);
        }
diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c
index 5400728eb791..411e1f8b11d0 100644
--- a/drivers/acpi/namespace/nsnames.c
+++ b/drivers/acpi/namespace/nsnames.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -75,7 +75,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
        acpi_size index;
        struct acpi_namespace_node *parent_node;
-        ACPI_FUNCTION_NAME("ns_build_external_path");
+        ACPI_FUNCTION_ENTRY();
        /* Special case for root */
@@ -110,9 +110,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
        name_buffer[index] = AML_ROOT_PREFIX;
        if (index != 0) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Could not construct pathname; index=%X, size=%X, Path=%s\n", (u32) index, (u32) size, &name_buffer[size]));
-                                  "Could not construct pathname; index=%X, size=%X, Path=%s\n",
-                                  (u32) index, (u32) size, &name_buffer[size]));
        }
        return;
@@ -148,7 +146,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
        name_buffer = ACPI_MEM_CALLOCATE(size);
        if (!name_buffer) {
-                ACPI_REPORT_ERROR(("ns_get_table_pathname: allocation failure\n"));
+                ACPI_REPORT_ERROR(("Allocation failure\n"));
                return_PTR(NULL);
        }
diff --git a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/namespace/nsobject.c
index fc9be946ebed..86113093f7b7 100644
--- a/drivers/acpi/namespace/nsobject.c
+++ b/drivers/acpi/namespace/nsobject.c
@@ -6,7 +6,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -84,21 +84,21 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
        if (!node) {
                /* Invalid handle */
-                ACPI_REPORT_ERROR(("ns_attach_object: Null named_obj handle\n"));
+                ACPI_REPORT_ERROR(("Null named_obj handle\n"));
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
        if (!object && (ACPI_TYPE_ANY != type)) {
                /* Null object */
-                ACPI_REPORT_ERROR(("ns_attach_object: Null object, but type not ACPI_TYPE_ANY\n"));
+                ACPI_REPORT_ERROR(("Null object, but type not ACPI_TYPE_ANY\n"));
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
        if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) {
                /* Not a name handle */
-                ACPI_REPORT_ERROR(("ns_attach_object: Invalid handle %p [%s]\n",
+                ACPI_REPORT_ERROR(("Invalid handle %p [%s]\n",
                                   node, acpi_ut_get_descriptor_name(node)));
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
@@ -254,7 +254,7 @@ union acpi_operand_object *acpi_ns_get_attached_object(struct
        ACPI_FUNCTION_TRACE_PTR("ns_get_attached_object", node);
        if (!node) {
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Null Node ptr\n"));
+                ACPI_REPORT_WARNING(("Null Node ptr\n"));
                return_PTR(NULL);
        }
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c
index 433442a9ec74..232be4303653 100644
--- a/drivers/acpi/namespace/nsparse.c
+++ b/drivers/acpi/namespace/nsparse.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index c1b1943d4670..f094a2eb8512 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -298,18 +298,15 @@ acpi_ns_search_and_enter(u32 target_name,
        /* Parameter validation */
        if (!node || !target_name || !return_node) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Null param: Node %p Name %X return_node %p\n", node, target_name, return_node));
-                                  "Null param: Node %p Name %X return_node %p\n",
-                                  node, target_name, return_node));
-                ACPI_REPORT_ERROR(("ns_search_and_enter: Null parameter\n"));
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
        /* Name must consist of printable characters */
        if (!acpi_ut_valid_acpi_name(target_name)) {
-                ACPI_REPORT_ERROR(("ns_search_and_enter: Bad character in ACPI Name: %X\n", target_name));
+                ACPI_REPORT_ERROR(("Bad character in ACPI Name: %X\n",
+                                   target_name));
                return_ACPI_STATUS(AE_BAD_CHARACTER);
        }
diff --git a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/namespace/nsutils.c
index 549075fb9f88..bc779fdd3caf 100644
--- a/drivers/acpi/namespace/nsutils.c
+++ b/drivers/acpi/namespace/nsutils.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,6 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);
 *
 * PARAMETERS:  module_name         - Caller's module name (for error output)
 *              line_number         - Caller's line number (for error output)
- *              component_id        - Caller's component ID (for error output)
 *              internal_name       - Name or path of the namespace node
 *              lookup_status       - Exception code from NS lookup
 *
@@ -76,14 +75,12 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);
 void
 acpi_ns_report_error(char *module_name,
                     u32 line_number,
-                     u32 component_id,
                     char *internal_name, acpi_status lookup_status)
 {
        acpi_status status;
        char *name = NULL;
-        acpi_os_printf("%8s-%04d: *** Error: Looking up ",
+        acpi_ut_report_error(module_name, line_number);
-                       module_name, line_number);
        if (lookup_status == AE_BAD_CHARACTER) {
                /* There is a non-ascii character in the name */
@@ -109,7 +106,7 @@ acpi_ns_report_error(char *module_name,
                }
        }
-        acpi_os_printf(" in namespace, %s\n",
+        acpi_os_printf("Namespace lookup failure, %s\n",
                       acpi_format_exception(lookup_status));
 }
@@ -119,10 +116,9 @@ acpi_ns_report_error(char *module_name,
 *
 * PARAMETERS:  module_name         - Caller's module name (for error output)
 *              line_number         - Caller's line number (for error output)
- *              component_id        - Caller's component ID (for error output)
 *              Message             - Error message to use on failure
 *              prefix_node         - Prefix relative to the path
- *              Path                - Path to the node
+ *              Path                - Path to the node (optional)
 *              method_status       - Execution status
 *
 * RETURN:      None
@@ -134,7 +130,6 @@ acpi_ns_report_error(char *module_name,
 void
 acpi_ns_report_method_error(char *module_name,
                            u32 line_number,
-                            u32 component_id,
                            char *message,
                            struct acpi_namespace_node *prefix_node,
                            char *path, acpi_status method_status)
@@ -142,17 +137,16 @@ acpi_ns_report_method_error(char *module_name,
        acpi_status status;
        struct acpi_namespace_node *node = prefix_node;
+        acpi_ut_report_error(module_name, line_number);
        if (path) {
                status = acpi_ns_get_node_by_path(path, prefix_node,
                                                  ACPI_NS_NO_UPSEARCH, &node);
                if (ACPI_FAILURE(status)) {
-                        acpi_os_printf
+                        acpi_os_printf("[Could not get node by pathname]");
-                            ("report_method_error: Could not get node\n");
-                        return;
                }
        }
-        acpi_os_printf("%8s-%04d: *** Error: ", module_name, line_number);
        acpi_ns_print_node_pathname(node, message);
        acpi_os_printf(", %s\n", acpi_format_exception(method_status));
 }
@@ -248,7 +242,7 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)
        ACPI_FUNCTION_TRACE("ns_get_type");
        if (!node) {
-                ACPI_REPORT_WARNING(("ns_get_type: Null Node input pointer\n"));
+                ACPI_REPORT_WARNING(("Null Node parameter\n"));
                return_UINT32(ACPI_TYPE_ANY);
        }
@@ -275,7 +269,7 @@ u32 acpi_ns_local(acpi_object_type type)
        if (!acpi_ut_valid_object_type(type)) {
                /* Type code out of range  */
-                ACPI_REPORT_WARNING(("ns_local: Invalid Object Type\n"));
+                ACPI_REPORT_WARNING(("Invalid Object Type %X\n", type));
                return_UINT32(ACPI_NS_NORMAL);
        }
@@ -627,7 +621,7 @@ acpi_ns_externalize_name(u32 internal_name_length,
         * with internal_name (invalid format).
         */
        if (required_length > internal_name_length) {
-                ACPI_REPORT_ERROR(("ns_externalize_name: Invalid internal name\n"));
+                ACPI_REPORT_ERROR(("Invalid internal name\n"));
                return_ACPI_STATUS(AE_BAD_PATHNAME);
        }
@@ -803,8 +797,7 @@ u32 acpi_ns_opens_scope(acpi_object_type type)
        if (!acpi_ut_valid_object_type(type)) {
                /* type code out of range  */
-                ACPI_REPORT_WARNING(("ns_opens_scope: Invalid Object Type %X\n",
+                ACPI_REPORT_WARNING(("Invalid Object Type %X\n", type));
-                                     type));
                return_UINT32(ACPI_NS_NORMAL);
        }
diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c
index 5f164c0df33b..fcab1e784b81 100644
--- a/drivers/acpi/namespace/nswalk.c
+++ b/drivers/acpi/namespace/nswalk.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index 75b137a6a3c9..de13add43efc 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -6,7 +6,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -112,8 +112,7 @@ acpi_evaluate_object_typed(acpi_handle handle,
        if (return_buffer->length == 0) {
                /* Error because caller specifically asked for a return value */
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "No return value\n"));
+                ACPI_REPORT_ERROR(("No return value\n"));
                return_ACPI_STATUS(AE_NULL_OBJECT);
        }
@@ -125,11 +124,11 @@ acpi_evaluate_object_typed(acpi_handle handle,
        /* Return object type does not match requested type */
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+        ACPI_REPORT_ERROR(("Incorrect return type [%s] requested [%s]\n",
-                          "Incorrect return type [%s] requested [%s]\n",
+                           acpi_ut_get_type_name(((union acpi_object *)
-                          acpi_ut_get_type_name(((union acpi_object *)
+                                                  return_buffer->pointer)->
-                                                 return_buffer->pointer)->type),
+                                                 type),
-                          acpi_ut_get_type_name(return_type)));
+                           acpi_ut_get_type_name(return_type)));
        if (must_free) {
                /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */
@@ -236,11 +235,9 @@ acpi_evaluate_object(acpi_handle handle,
                 * qualified names above, this is an error
                 */
                if (!pathname) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Both Handle and Pathname are NULL\n"));
-                                          "Both Handle and Pathname are NULL\n"));
                } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Handle is NULL and Pathname is relative\n"));
-                                          "Handle is NULL and Pathname is relative\n"));
                }
                status = AE_BAD_PARAMETER;
diff --git a/drivers/acpi/namespace/nsxfname.c b/drivers/acpi/namespace/nsxfname.c
index 6b5f8d4481d1..853e6d170c96 100644
--- a/drivers/acpi/namespace/nsxfname.c
+++ b/drivers/acpi/namespace/nsxfname.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsxfobj.c b/drivers/acpi/namespace/nsxfobj.c
index 0856d42e6909..a0332595677a 100644
--- a/drivers/acpi/namespace/nsxfobj.c
+++ b/drivers/acpi/namespace/nsxfobj.c
@@ -6,7 +6,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/parser/psargs.c b/drivers/acpi/parser/psargs.c
index e6d4cb9fd303..3c37cd0ecd80 100644
--- a/drivers/acpi/parser/psargs.c
+++ b/drivers/acpi/parser/psargs.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -298,7 +298,7 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
                acpi_ps_append_arg(arg, name_op);
                if (!method_desc) {
-                        ACPI_REPORT_ERROR(("ps_get_next_namepath: Control Method %p has no attached object\n", node));
+                        ACPI_REPORT_ERROR(("Control Method %p has no attached object\n", node));
                        return_ACPI_STATUS(AE_AML_INTERNAL);
                }
diff --git a/drivers/acpi/parser/psloop.c b/drivers/acpi/parser/psloop.c
index e81e51b8b3ae..c66029b890b1 100644
--- a/drivers/acpi/parser/psloop.c
+++ b/drivers/acpi/parser/psloop.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
@@ -123,16 +123,10 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                    && ((status & AE_CODE_MASK) !=
                                        AE_CODE_CONTROL)) {
                                        if (status == AE_AML_NO_RETURN_VALUE) {
-                                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                                ACPI_REPORT_ERROR(("Invoked method did not return a value, %s\n", acpi_format_exception(status)));
-                                                                  "Invoked method did not return a value, %s\n",
-                                                                  acpi_format_exception
-                                                                  (status)));
                                        }
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                        ACPI_REPORT_ERROR(("get_predicate Failed, %s\n", acpi_format_exception(status)));
-                                                          "get_predicate Failed, %s\n",
-                                                          acpi_format_exception
-                                                          (status)));
                                        return_ACPI_STATUS(status);
                                }
@@ -190,11 +184,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                /* The opcode is unrecognized.  Just skip unknown opcodes */
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                ACPI_REPORT_ERROR(("Found unknown opcode %X at AML address %p offset %X, ignoring\n", walk_state->opcode, parser_state->aml, walk_state->aml_offset));
-                                                  "Found unknown opcode %X at AML address %p offset %X, ignoring\n",
-                                                  walk_state->opcode,
-                                                  parser_state->aml,
-                                                  walk_state->aml_offset));
                                ACPI_DUMP_BUFFER(parser_state->aml, 128);
@@ -281,10 +271,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                    walk_state->descending_callback(walk_state,
                                                                    &op);
                                if (ACPI_FAILURE(status)) {
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                        ACPI_REPORT_ERROR(("During name lookup/catalog, %s\n", acpi_format_exception(status)));
-                                                          "During name lookup/catalog, %s\n",
-                                                          acpi_format_exception
-                                                          (status)));
                                        goto close_this_op;
                                }
diff --git a/drivers/acpi/parser/psopcode.c b/drivers/acpi/parser/psopcode.c
index 229ae86afe8b..11d6351ab8b2 100644
--- a/drivers/acpi/parser/psopcode.c
+++ b/drivers/acpi/parser/psopcode.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
@@ -747,7 +747,7 @@ const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
        /* Unknown AML opcode */
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                          "Unknown AML opcode [%4.4X]\n", opcode));
        return (&acpi_gbl_aml_op_info[_UNK]);
diff --git a/drivers/acpi/parser/psparse.c b/drivers/acpi/parser/psparse.c
index f0979b2956f2..3b540fe17a0c 100644
--- a/drivers/acpi/parser/psparse.c
+++ b/drivers/acpi/parser/psparse.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
@@ -512,9 +512,9 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
                } else if ((status != AE_OK) && (walk_state->method_desc)) {
                        /* Either the method parse or actual execution failed */
-                        ACPI_REPORT_METHOD_ERROR
+                        ACPI_REPORT_MTERROR("Method parse/execution failed",
-                            ("Method parse/execution failed",
+                                            walk_state->method_node, NULL,
-                             walk_state->method_node, NULL, status);
+                                            status);
                        /* Check for possible multi-thread reentrancy problem */
diff --git a/drivers/acpi/parser/psscope.c b/drivers/acpi/parser/psscope.c
index 1c953b6f1af1..bc6047caccd9 100644
--- a/drivers/acpi/parser/psscope.c
+++ b/drivers/acpi/parser/psscope.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/parser/pstree.c b/drivers/acpi/parser/pstree.c
index f0e755884eea..d387e2b01dbb 100644
--- a/drivers/acpi/parser/pstree.c
+++ b/drivers/acpi/parser/pstree.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
@@ -132,7 +132,8 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)
        if (op_info->class == AML_CLASS_UNKNOWN) {
                /* Invalid opcode */
-                ACPI_REPORT_ERROR(("ps_append_arg: Invalid AML Opcode: 0x%2.2X\n", op->common.aml_opcode));
+                ACPI_REPORT_ERROR(("Invalid AML Opcode: 0x%2.2X\n",
+                                   op->common.aml_opcode));
                return;
        }
diff --git a/drivers/acpi/parser/psutils.c b/drivers/acpi/parser/psutils.c
index 2075efbb4324..3e07cb9cb748 100644
--- a/drivers/acpi/parser/psutils.c
+++ b/drivers/acpi/parser/psutils.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/parser/pswalk.c b/drivers/acpi/parser/pswalk.c
index 08f2321b6ded..06f05bfd7612 100644
--- a/drivers/acpi/parser/pswalk.c
+++ b/drivers/acpi/parser/pswalk.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/parser/psxface.c b/drivers/acpi/parser/psxface.c
index 14d544d60867..2dd48cbb7c02 100644
--- a/drivers/acpi/parser/psxface.c
+++ b/drivers/acpi/parser/psxface.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/resources/rsaddr.c b/drivers/acpi/resources/rsaddr.c
index 4ac942badbc0..8fa3213ce000 100644
--- a/drivers/acpi/resources/rsaddr.c
+++ b/drivers/acpi/resources/rsaddr.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/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index c2c4d9079c6c..1dfa6906d455 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.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/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index 6c7c6c560635..7f46ca0bf33a 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.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
@@ -207,21 +207,14 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                /* Each element of the top-level package must also be a package */
                if (ACPI_GET_OBJECT_TYPE(*top_object_list) != ACPI_TYPE_PACKAGE) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("(PRT[%X]) Need sub-package, found %s\n", index, acpi_ut_get_object_type_name(*top_object_list)));
-                                          "(PRT[%X]) Need sub-package, found %s\n",
-                                          index,
-                                          acpi_ut_get_object_type_name
-                                          (*top_object_list)));
                        return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                }
                /* Each sub-package must be of length 4 */
                if ((*top_object_list)->package.count != 4) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("(PRT[%X]) Need package of length 4, found length %d\n", index, (*top_object_list)->package.count));
-                                          "(PRT[%X]) Need package of length 4, found length %d\n",
-                                          index,
-                                          (*top_object_list)->package.count));
                        return_ACPI_STATUS(AE_AML_PACKAGE_LIMIT);
                }
@@ -238,11 +231,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
                        user_prt->address = obj_desc->integer.value;
                } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("(PRT[%X].Address) Need Integer, found %s\n", index, acpi_ut_get_object_type_name(obj_desc)));
-                                          "(PRT[%X].Address) Need Integer, found %s\n",
-                                          index,
-                                          acpi_ut_get_object_type_name
-                                          (obj_desc)));
                        return_ACPI_STATUS(AE_BAD_DATA);
                }
@@ -252,11 +241,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
                        user_prt->pin = (u32) obj_desc->integer.value;
                } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("(PRT[%X].Pin) Need Integer, found %s\n", index, acpi_ut_get_object_type_name(obj_desc)));
-                                          "(PRT[%X].Pin) Need Integer, found %s\n",
-                                          index,
-                                          acpi_ut_get_object_type_name
-                                          (obj_desc)));
                        return_ACPI_STATUS(AE_BAD_DATA);
                }
@@ -267,10 +252,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                case ACPI_TYPE_LOCAL_REFERENCE:
                        if (obj_desc->reference.opcode != AML_INT_NAMEPATH_OP) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                ACPI_REPORT_ERROR(("(PRT[%X].Source) Need name, found reference op %X\n", index, obj_desc->reference.opcode));
-                                                  "(PRT[%X].Source) Need name, found reference op %X\n",
-                                                  index,
-                                                  obj_desc->reference.opcode));
                                return_ACPI_STATUS(AE_BAD_DATA);
                        }
@@ -316,11 +298,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                default:
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("(PRT[%X].Source) Need Ref/String/Integer, found %s\n", index, acpi_ut_get_object_type_name(obj_desc)));
-                                          "(PRT[%X].Source) Need Ref/String/Integer, found %s\n",
-                                          index,
-                                          acpi_ut_get_object_type_name
-                                          (obj_desc)));
                        return_ACPI_STATUS(AE_BAD_DATA);
                }
@@ -335,11 +313,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
                        user_prt->source_index = (u32) obj_desc->integer.value;
                } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("(PRT[%X].source_index) Need Integer, found %s\n", index, acpi_ut_get_object_type_name(obj_desc)));
-                                          "(PRT[%X].source_index) Need Integer, found %s\n",
-                                          index,
-                                          acpi_ut_get_object_type_name
-                                          (obj_desc)));
                        return_ACPI_STATUS(AE_BAD_DATA);
                }
diff --git a/drivers/acpi/resources/rsdump.c b/drivers/acpi/resources/rsdump.c
index c24e3eb658c3..98356e2482c5 100644
--- a/drivers/acpi/resources/rsdump.c
+++ b/drivers/acpi/resources/rsdump.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/resources/rsinfo.c b/drivers/acpi/resources/rsinfo.c
index 623b06689336..d9ae64b77bd9 100644
--- a/drivers/acpi/resources/rsinfo.c
+++ b/drivers/acpi/resources/rsinfo.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/resources/rsio.c b/drivers/acpi/resources/rsio.c
index ef24ba110c6e..ea567167c4f2 100644
--- a/drivers/acpi/resources/rsio.c
+++ b/drivers/acpi/resources/rsio.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/resources/rsirq.c b/drivers/acpi/resources/rsirq.c
index 79e71257b69a..1fa63bc2e36f 100644
--- a/drivers/acpi/resources/rsirq.c
+++ b/drivers/acpi/resources/rsirq.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/resources/rslist.c b/drivers/acpi/resources/rslist.c
index 573c06705641..e4778a51c17e 100644
--- a/drivers/acpi/resources/rslist.c
+++ b/drivers/acpi/resources/rslist.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
@@ -156,9 +156,7 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
                /* Validate the (internal) Resource Type */
                if (resource->type > ACPI_RESOURCE_TYPE_MAX) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Invalid descriptor type (%X) in resource list\n", resource->type));
-                                          "Invalid descriptor type (%X) in resource list\n",
-                                          resource->type));
                        return_ACPI_STATUS(AE_BAD_DATA);
                }
diff --git a/drivers/acpi/resources/rsmemory.c b/drivers/acpi/resources/rsmemory.c
index 418a3fb64077..a5131936d690 100644
--- a/drivers/acpi/resources/rsmemory.c
+++ b/drivers/acpi/resources/rsmemory.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/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c
index 4a758bd4a5c8..83bfe0dd3eba 100644
--- a/drivers/acpi/resources/rsmisc.c
+++ b/drivers/acpi/resources/rsmisc.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
@@ -523,9 +523,7 @@ if (((aml->irq.flags & 0x09) == 0x00) || ((aml->irq.flags & 0x09) == 0x09)) {
         * polarity/trigger interrupts are allowed (ACPI spec, section
         * "IRQ Format"), so 0x00 and 0x09 are illegal.
         */
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+        ACPI_REPORT_ERROR(("Invalid interrupt polarity/trigger in resource list, %X\n", aml->irq.flags));
-                          "Invalid interrupt polarity/trigger in resource list, %X\n",
-                          aml->irq.flags));
        return_ACPI_STATUS(AE_BAD_DATA);
 }
@@ -537,8 +535,7 @@ if (temp8 < 1) {
 }
 if (resource->data.dma.transfer == 0x03) {
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+        ACPI_REPORT_ERROR(("Invalid DMA.Transfer preference (3)\n"));
-                          "Invalid DMA.Transfer preference (3)\n"));
        return_ACPI_STATUS(AE_BAD_DATA);
 }
 #endif
diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c
index 2236a0c90daa..25b5aedd6612 100644
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/resources/rsutils.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/resources/rsxface.c b/drivers/acpi/resources/rsxface.c
index 50a956b705b0..88b67077aeeb 100644
--- a/drivers/acpi/resources/rsxface.c
+++ b/drivers/acpi/resources/rsxface.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/tables/tbconvrt.c b/drivers/acpi/tables/tbconvrt.c
index cd33397d9231..48290b7e6ba5 100644
--- a/drivers/acpi/tables/tbconvrt.c
+++ b/drivers/acpi/tables/tbconvrt.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/tables/tbget.c b/drivers/acpi/tables/tbget.c
index 6acd5aeb093e..0fedf4b27ea5 100644
--- a/drivers/acpi/tables/tbget.c
+++ b/drivers/acpi/tables/tbget.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
@@ -362,8 +362,8 @@ acpi_tb_get_this_table(struct acpi_pointer *address,
        default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid address flags %X\n",
+                ACPI_REPORT_ERROR(("Invalid address flags %X\n",
-                                  address->pointer_type));
+                                   address->pointer_type));
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
diff --git a/drivers/acpi/tables/tbgetall.c b/drivers/acpi/tables/tbgetall.c
index 33c9ed8a6f99..496f336b3e3a 100644
--- a/drivers/acpi/tables/tbgetall.c
+++ b/drivers/acpi/tables/tbgetall.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/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c
index 10db8484e462..e1c9faa3982e 100644
--- a/drivers/acpi/tables/tbinstal.c
+++ b/drivers/acpi/tables/tbinstal.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/tables/tbrsdt.c b/drivers/acpi/tables/tbrsdt.c
index 3cee0cee4cc2..178309026850 100644
--- a/drivers/acpi/tables/tbrsdt.c
+++ b/drivers/acpi/tables/tbrsdt.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
@@ -176,7 +176,7 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
 {
        int no_match;
-        ACPI_FUNCTION_NAME("tb_validate_rsdt");
+        ACPI_FUNCTION_ENTRY();
        /*
         * Search for appropriate signature, RSDT or XSDT
@@ -192,15 +192,11 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
        if (no_match) {
                /* Invalid RSDT or XSDT signature */
-                ACPI_REPORT_ERROR(("Invalid signature where RSDP indicates RSDT/XSDT should be located\n"));
+                ACPI_REPORT_ERROR(("Invalid signature where RSDP indicates RSDT/XSDT should be located. RSDP:\n"));
                ACPI_DUMP_BUFFER(acpi_gbl_RSDP, 20);
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("RSDT/XSDT signature at %X (%p) is invalid\n", acpi_gbl_RSDP->rsdt_physical_address, (void *)(acpi_native_uint) acpi_gbl_RSDP->rsdt_physical_address));
-                                      "RSDT/XSDT signature at %X (%p) is invalid\n",
-                                      acpi_gbl_RSDP->rsdt_physical_address,
-                                      (void *)(acpi_native_uint) acpi_gbl_RSDP->
-                                      rsdt_physical_address));
                if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
                        ACPI_REPORT_ERROR(("Looking for RSDT\n"))
@@ -209,7 +205,6 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
                }
                ACPI_DUMP_BUFFER((char *)table_ptr, 48);
                return (AE_BAD_SIGNATURE);
        }
@@ -243,9 +238,8 @@ acpi_status acpi_tb_get_table_rsdt(void)
        table_info.type = ACPI_TABLE_XSDT;
        status = acpi_tb_get_table(&address, &table_info);
        if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Could not get the RSDT/XSDT, %s\n",
-                                  "Could not get the RSDT/XSDT, %s\n",
+                                   acpi_format_exception(status)));
-                                  acpi_format_exception(status)));
                return_ACPI_STATUS(status);
        }
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index 9d0bf536d674..38c6749e43d5 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.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
@@ -144,14 +144,13 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)
 {
        acpi_name signature;
-        ACPI_FUNCTION_NAME("tb_validate_table_header");
+        ACPI_FUNCTION_ENTRY();
        /* Verify that this is a valid address */
        if (!acpi_os_readable(table_header, sizeof(struct acpi_table_header))) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Cannot read table header at %p\n",
-                                  "Cannot read table header at %p\n",
+                                   table_header));
-                                  table_header));
                return (AE_BAD_ADDRESS);
        }
@@ -160,12 +159,10 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)
        ACPI_MOVE_32_TO_32(&signature, table_header->signature);
        if (!acpi_ut_valid_acpi_name(signature)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Table signature at %p [%p] has invalid characters\n", table_header, &signature));
-                                  "Table signature at %p [%p] has invalid characters\n",
-                                  table_header, &signature));
                ACPI_REPORT_WARNING(("Invalid table signature found: [%4.4s]\n",
-                                     (char *)&signature));
+                                     ACPI_CAST_PTR(char, &signature)));
                ACPI_DUMP_BUFFER(table_header,
                                 sizeof(struct acpi_table_header));
@@ -175,9 +172,7 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)
        /* Validate the table length */
        if (table_header->length < sizeof(struct acpi_table_header)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("Invalid length in table header %p name %4.4s\n", table_header, (char *)&signature));
-                                  "Invalid length in table header %p name %4.4s\n",
-                                  table_header, (char *)&signature));
                ACPI_REPORT_WARNING(("Invalid table header length (0x%X) found\n", (u32) table_header->length));
@@ -291,8 +286,7 @@ acpi_tb_handle_to_object(u16 table_id,
                }
        }
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "table_id=%X does not exist\n",
+        ACPI_REPORT_ERROR(("table_id=%X does not exist\n", table_id));
-                          table_id));
        return (AE_BAD_PARAMETER);
 }
 #endif
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index 3f96a4909aad..83a9ca8cb98c 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.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
@@ -75,7 +75,7 @@ acpi_status acpi_load_tables(void)
        status = acpi_os_get_root_pointer(ACPI_LOGICAL_ADDRESSING,
                                          &rsdp_address);
        if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("acpi_load_tables: Could not get RSDP, %s\n",
+                ACPI_REPORT_ERROR(("Could not get RSDP, %s\n",
                                   acpi_format_exception(status)));
                goto error_exit;
        }
@@ -86,7 +86,8 @@ acpi_status acpi_load_tables(void)
        status = acpi_tb_verify_rsdp(&rsdp_address);
        if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("acpi_load_tables: RSDP Failed validation: %s\n", acpi_format_exception(status)));
+                ACPI_REPORT_ERROR(("RSDP Failed validation: %s\n",
+                                   acpi_format_exception(status)));
                goto error_exit;
        }
@@ -94,7 +95,8 @@ acpi_status acpi_load_tables(void)
        status = acpi_tb_get_table_rsdt();
        if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("acpi_load_tables: Could not load RSDT: %s\n", acpi_format_exception(status)));
+                ACPI_REPORT_ERROR(("Could not load RSDT: %s\n",
+                                   acpi_format_exception(status)));
                goto error_exit;
        }
@@ -102,7 +104,7 @@ acpi_status acpi_load_tables(void)
        status = acpi_tb_get_required_tables();
        if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("acpi_load_tables: Error getting required tables (DSDT/FADT/FACS): %s\n", acpi_format_exception(status)));
+                ACPI_REPORT_ERROR(("Could not get all required tables (DSDT/FADT/FACS): %s\n", acpi_format_exception(status)));
                goto error_exit;
        }
@@ -112,14 +114,15 @@ acpi_status acpi_load_tables(void)
        status = acpi_ns_load_namespace();
        if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("acpi_load_tables: Could not load namespace: %s\n", acpi_format_exception(status)));
+                ACPI_REPORT_ERROR(("Could not load namespace: %s\n",
+                                   acpi_format_exception(status)));
                goto error_exit;
        }
        return_ACPI_STATUS(AE_OK);
      error_exit:
-        ACPI_REPORT_ERROR(("acpi_load_tables: Could not load tables: %s\n",
+        ACPI_REPORT_ERROR(("Could not load tables: %s\n",
                           acpi_format_exception(status)));
        return_ACPI_STATUS(status);
diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c
index b01a4b2ae7da..6538ed818f5b 100644
--- a/drivers/acpi/tables/tbxfroot.c
+++ b/drivers/acpi/tables/tbxfroot.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
@@ -396,9 +396,8 @@ acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address)
        status = acpi_tb_find_rsdp(&table_info, flags);
        if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("RSDP structure not found, %s Flags=%X\n",
-                                  "RSDP structure not found, %s Flags=%X\n",
+                                   acpi_format_exception(status), flags));
-                                  acpi_format_exception(status), flags));
                return_ACPI_STATUS(AE_NO_ACPI_TABLES);
        }
@@ -503,10 +502,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
                                            ACPI_EBDA_PTR_LENGTH,
                                            (void *)&table_ptr);
                if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Could not map memory at %8.8X for length %X\n", ACPI_EBDA_PTR_LOCATION, ACPI_EBDA_PTR_LENGTH));
-                                          "Could not map memory at %8.8X for length %X\n",
-                                          ACPI_EBDA_PTR_LOCATION,
-                                          ACPI_EBDA_PTR_LENGTH));
                        return_ACPI_STATUS(status);
                }
@@ -530,10 +526,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
                                                    ACPI_EBDA_WINDOW_SIZE,
                                                    (void *)&table_ptr);
                        if (ACPI_FAILURE(status)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                ACPI_REPORT_ERROR(("Could not map memory at %8.8X for length %X\n", physical_address, ACPI_EBDA_WINDOW_SIZE));
-                                                  "Could not map memory at %8.8X for length %X\n",
-                                                  physical_address,
-                                                  ACPI_EBDA_WINDOW_SIZE));
                                return_ACPI_STATUS(status);
                        }
@@ -563,10 +556,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
                                            (void *)&table_ptr);
                if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        ACPI_REPORT_ERROR(("Could not map memory at %8.8X for length %X\n", ACPI_HI_RSDP_WINDOW_BASE, ACPI_HI_RSDP_WINDOW_SIZE));
-                                          "Could not map memory at %8.8X for length %X\n",
-                                          ACPI_HI_RSDP_WINDOW_BASE,
-                                          ACPI_HI_RSDP_WINDOW_SIZE));
                        return_ACPI_STATUS(status);
                }
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_REPORT_ERROR(("Could not free memory, %s\n",
-                                  acpi_format_exception(status)));
+                                   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",
+                ACPI_REPORT_ERROR(("Element %p Address %p\n",
-                                  element, allocation));
+                                   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,
+                ACPI_REPORT_INFO(("No outstanding allocations\n"));
-                                  "No outstanding allocations\n"));
        } else {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                ACPI_REPORT_ERROR(("%d(%X) Outstanding allocations\n",
-                                  "%d(%X) Outstanding allocations\n",
+                                   num_outstanding, num_outstanding));
-                                  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,
+                ACPI_REPORT_ERROR(("Packages as parameters not implemented!\n"));
-                                  "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",
+                ACPI_REPORT_ERROR(("Unknown action (%X)\n", action));
-                                  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,
+                ACPI_REPORT_WARNING(("Large Reference Count (%X) in object %p\n\n", count, object));
-                                  "**** 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",
+                        ACPI_REPORT_MTERROR("Method execution failed",
-                                                 prefix_node, path, status);
+                                            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",
+                        ACPI_REPORT_MTERROR("No object was returned from",
-                                                 prefix_node, path,
+                                            prefix_node, path, AE_NOT_EXIST);
-                                                 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",
+                ACPI_REPORT_MTERROR("Return object type is incorrect",
-                                         prefix_node, path, AE_TYPE);
+                                    prefix_node, path, AE_TYPE);
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                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));
-                                  "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,
+                ACPI_REPORT_ERROR(("Unknown exception code: 0x%8.8X\n",
-                                  "Unknown exception code: 0x%8.8X\n", status));
+                                   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_REPORT_ERROR(("ACPI Subsystem is already terminated\n"));
-                                  "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
+void acpi_ut_report_warning(char *module_name, u32 line_number)
-acpi_ut_report_warning(char *module_name, u32 line_number, u32 component_id)
 {
-        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,
+                                        ACPI_REPORT_ERROR(("Mutex [%s] already acquired by this thread [%X]\n", acpi_ut_get_mutex_name(mutex_id), this_thread_id));
-                                                          "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,
+                                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)));
-                                                  "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,
+                ACPI_REPORT_ERROR(("Thread %X could not acquire Mutex [%X] %s\n", this_thread_id, mutex_id, acpi_format_exception(status)));
-                                  "Thread %X could not acquire Mutex [%s] %s\n",
-                                  this_thread_id,
-                                  acpi_ut_get_mutex_name(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,
+                ACPI_REPORT_ERROR(("Mutex [%X] is not acquired, cannot release\n", mutex_id));
-                                  "Mutex [%s] is not acquired, cannot release\n",
-                                  acpi_ut_get_mutex_name(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,
+                                ACPI_REPORT_ERROR(("Invalid release order: owns [%s], releasing [%s]\n", acpi_ut_get_mutex_name(i), acpi_ut_get_mutex_name(mutex_id)));
-                                                  "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,
+                ACPI_REPORT_ERROR(("Thread %X could not release Mutex [%X] %s\n", this_thread_id, mutex_id, acpi_format_exception(status)));
-                                  "Thread %X could not release Mutex [%s] %s\n",
-                                  this_thread_id,
-                                  acpi_ut_get_mutex_name(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,
+                ACPI_REPORT_ERROR(("%p is not an ACPI Operand object [%s]\n",
-                                  "%p is not an ACPI Operand object [%s]\n",
+                                   object,
-                                  object, acpi_ut_get_descriptor_name(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,
+                        ACPI_REPORT_ERROR(("Unsupported Reference opcode=%X in object %p\n", internal_object->reference.opcode, internal_object));
-                                          "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,
+                ACPI_REPORT_ERROR(("Unsupported type=%X in object %p\n",
-                                  "Unsupported type=%X in object %p\n",
+                                   ACPI_GET_OBJECT_TYPE(internal_object),
-                                  ACPI_GET_OBJECT_TYPE(internal_object),
+                                   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_REPORT_WARNING(("acpi_enable failed\n"));
-                                          "acpi_enable failed.\n"));
                        return_ACPI_STATUS(status);
                }
        }
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index 1f2477eb95fe..675a32f78329 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -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
@@ -63,7 +63,7 @@
 /* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION                 0x20051216
+#define ACPI_CA_VERSION                 0x20060113
 /*
 * OS name, used for the _OS object.  The _OS object is essentially obsolete,
diff --git a/include/acpi/acdebug.h b/include/acpi/acdebug.h
index 70ce3b4d006e..d8167095caf3 100644
--- a/include/acpi/acdebug.h
+++ b/include/acpi/acdebug.h
@@ -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/include/acpi/acdisasm.h b/include/acpi/acdisasm.h
index 0a8f49f5d2f1..11a8fe39cb04 100644
--- a/include/acpi/acdisasm.h
+++ b/include/acpi/acdisasm.h
@@ -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/include/acpi/acdispat.h b/include/acpi/acdispat.h
index cc6407eef701..c41a926ff317 100644
--- a/include/acpi/acdispat.h
+++ b/include/acpi/acdispat.h
@@ -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/include/acpi/acevents.h b/include/acpi/acevents.h
index b40062c3ba7a..f2717be4fe0d 100644
--- a/include/acpi/acevents.h
+++ b/include/acpi/acevents.h
@@ -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/include/acpi/acexcep.h b/include/acpi/acexcep.h
index 4f005eb65928..dc768aa580e4 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -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/include/acpi/acglobal.h b/include/acpi/acglobal.h
index dfb3b2493ae5..734cc77bf2c7 100644
--- a/include/acpi/acglobal.h
+++ b/include/acpi/acglobal.h
@@ -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/include/acpi/achware.h b/include/acpi/achware.h
index 3644d7248e7e..29b60a8c0593 100644
--- a/include/acpi/achware.h
+++ b/include/acpi/achware.h
@@ -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/include/acpi/acinterp.h b/include/acpi/acinterp.h
index 87e5e44572ca..9f22cfcb624b 100644
--- a/include/acpi/acinterp.h
+++ b/include/acpi/acinterp.h
@@ -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/include/acpi/aclocal.h b/include/acpi/aclocal.h
index da7f1cb96f5d..97f8e4185e4f 100644
--- a/include/acpi/aclocal.h
+++ b/include/acpi/aclocal.h
@@ -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/include/acpi/acmacros.h b/include/acpi/acmacros.h
index 0fa8f72dbace..49ba151766de 100644
--- a/include/acpi/acmacros.h
+++ b/include/acpi/acmacros.h
@@ -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
@@ -443,56 +443,66 @@
 #define INCREMENT_ARG_LIST(list)        (list >>= ((u32) ARG_TYPE_WIDTH))
 /*
- * Reporting macros that are never compiled out
+ * Module name is include in both debug and non-debug versions primarily for
+ * error messages. The __FILE__ macro is not very useful for this, because it
+ * often includes the entire pathname to the module
 */
-#define ACPI_PARAM_LIST(pl)                 pl
+#if defined (ACPI_DEBUG_OUTPUT) || !defined (ACPI_NO_ERROR_MESSAGES)
+#define ACPI_MODULE_NAME(name)          static char ACPI_UNUSED_VAR *_acpi_module_name = name;
+#else
+#define ACPI_MODULE_NAME(name)
+#endif
 /*
- * Error reporting.  These versions add callers module and line#.
+ * Ascii error messages can be configured out
- *
- * Since _acpi_module_name gets compiled out when ACPI_DEBUG_OUTPUT
- * isn't defined, only use it in debug mode.
 */
-#ifdef ACPI_DEBUG_OUTPUT
+#ifndef ACPI_NO_ERROR_MESSAGES
+#define ACPI_PARAM_LIST(pl)             pl
+#define ACPI_LOCATION_INFO              _acpi_module_name, __LINE__
-#define ACPI_REPORT_INFO(fp)                {acpi_ut_report_info(_acpi_module_name,__LINE__,_COMPONENT); \
+/*
-                                                                                                acpi_os_printf ACPI_PARAM_LIST(fp);}
+ * Error reporting. Callers module and line number are inserted automatically
-#define ACPI_REPORT_ERROR(fp)               {acpi_ut_report_error(_acpi_module_name,__LINE__,_COMPONENT); \
+ * These macros are used for both the debug and non-debug versions of the code
-                                                                                                acpi_os_printf ACPI_PARAM_LIST(fp);}
+ */
-#define ACPI_REPORT_WARNING(fp)             {acpi_ut_report_warning(_acpi_module_name,__LINE__,_COMPONENT); \
+#define ACPI_REPORT_INFO(fp)            {acpi_ut_report_info (ACPI_LOCATION_INFO); \
-                                                                                                acpi_os_printf ACPI_PARAM_LIST(fp);}
+                                                                                        acpi_os_printf ACPI_PARAM_LIST (fp);}
-#define ACPI_REPORT_NSERROR(s,e)            acpi_ns_report_error(_acpi_module_name,__LINE__,_COMPONENT, s, e);
+#define ACPI_REPORT_ERROR(fp)           {acpi_ut_report_error (ACPI_LOCATION_INFO); \
+                                                                                        acpi_os_printf ACPI_PARAM_LIST (fp);}
+#define ACPI_REPORT_WARNING(fp)         {acpi_ut_report_warning (ACPI_LOCATION_INFO); \
+                                                                                        acpi_os_printf ACPI_PARAM_LIST (fp);}
+#define ACPI_REPORT_NSERROR(s,e)        acpi_ns_report_error (ACPI_LOCATION_INFO, \
+                                                                                        s, e);
+#define ACPI_REPORT_MTERROR(s,n,p,e)    acpi_ns_report_method_error (ACPI_LOCATION_INFO, \
+                                                                                        s, n, p, e);
-#define ACPI_REPORT_METHOD_ERROR(s,n,p,e)   acpi_ns_report_method_error(_acpi_module_name,__LINE__,_COMPONENT, s, n, p, e);
+/* Error reporting. These versions pass thru the module and lineno */
+#define _ACPI_REPORT_INFO(a,b,fp)       {acpi_ut_report_info (a,b); \
+                                                                                        acpi_os_printf ACPI_PARAM_LIST (fp);}
+#define _ACPI_REPORT_ERROR(a,b,fp)      {acpi_ut_report_error (a,b); \
+                                                                                        acpi_os_printf ACPI_PARAM_LIST (fp);}
+#define _ACPI_REPORT_WARNING(a,b,fp)    {acpi_ut_report_warning (a,b); \
+                                                                                        acpi_os_printf ACPI_PARAM_LIST (fp);}
 #else
-#define ACPI_REPORT_INFO(fp)                {acpi_ut_report_info("ACPI",__LINE__,_COMPONENT); \
+/* No error messages */
-                                                                                                acpi_os_printf ACPI_PARAM_LIST(fp);}
-#define ACPI_REPORT_ERROR(fp)               {acpi_ut_report_error("ACPI",__LINE__,_COMPONENT); \
-                                                                                                acpi_os_printf ACPI_PARAM_LIST(fp);}
-#define ACPI_REPORT_WARNING(fp)             {acpi_ut_report_warning("ACPI",__LINE__,_COMPONENT); \
-                                                                                                acpi_os_printf ACPI_PARAM_LIST(fp);}
-#define ACPI_REPORT_NSERROR(s,e)            acpi_ns_report_error("ACPI",__LINE__,_COMPONENT, s, e);
-#define ACPI_REPORT_METHOD_ERROR(s,n,p,e)   acpi_ns_report_method_error("ACPI",__LINE__,_COMPONENT, s, n, p, e);
+#define ACPI_REPORT_INFO(fp)
+#define ACPI_REPORT_ERROR(fp)
+#define ACPI_REPORT_WARNING(fp)
+#define ACPI_REPORT_NSERROR(s,e)
+#define ACPI_REPORT_MTERROR(s,n,p,e)
+#define _ACPI_REPORT_INFO(a,b,c,fp)
+#define _ACPI_REPORT_ERROR(a,b,c,fp)
+#define _ACPI_REPORT_WARNING(a,b,c,fp)
 #endif
-/* Error reporting.  These versions pass thru the module and line# */
-#define _ACPI_REPORT_INFO(a,b,c,fp)         {acpi_ut_report_info(a,b,c); \
-                                                                                                acpi_os_printf ACPI_PARAM_LIST(fp);}
-#define _ACPI_REPORT_ERROR(a,b,c,fp)        {acpi_ut_report_error(a,b,c); \
-                                                                                                acpi_os_printf ACPI_PARAM_LIST(fp);}
-#define _ACPI_REPORT_WARNING(a,b,c,fp)      {acpi_ut_report_warning(a,b,c); \
-                                                                                                acpi_os_printf ACPI_PARAM_LIST(fp);}
 /*
 * Debug macros that are conditionally compiled
 */
 #ifdef ACPI_DEBUG_OUTPUT
-#define ACPI_MODULE_NAME(name)          static char ACPI_UNUSED_VAR *_acpi_module_name = name;
 /*
 * Common parameters used for debug output functions:
@@ -649,9 +659,6 @@
 * This is the non-debug case -- make everything go away,
 * leaving no executable debug code!
 */
-#define ACPI_MODULE_NAME(name)
-#define _acpi_module_name ""
 #define ACPI_DEBUG_EXEC(a)
 #define ACPI_NORMAL_EXEC(a)             a;
diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h
index 4f9063f3e951..b67da3636899 100644
--- a/include/acpi/acnames.h
+++ b/include/acpi/acnames.h
@@ -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/include/acpi/acnamesp.h b/include/acpi/acnamesp.h
index dd3501f7e5d6..b667a804fc8a 100644
--- a/include/acpi/acnamesp.h
+++ b/include/acpi/acnamesp.h
@@ -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
@@ -263,13 +263,11 @@ u32 acpi_ns_local(acpi_object_type type);
 void
 acpi_ns_report_error(char *module_name,
                     u32 line_number,
-                     u32 component_id,
                     char *internal_name, acpi_status lookup_status);
 void
 acpi_ns_report_method_error(char *module_name,
                            u32 line_number,
-                            u32 component_id,
                            char *message,
                            struct acpi_namespace_node *node,
                            char *path, acpi_status lookup_status);
diff --git a/include/acpi/acobject.h b/include/acpi/acobject.h
index 4a326ba6d482..1bd411962c77 100644
--- a/include/acpi/acobject.h
+++ b/include/acpi/acobject.h
@@ -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/include/acpi/acopcode.h b/include/acpi/acopcode.h
index 64da42992199..e6d78bd9e90a 100644
--- a/include/acpi/acopcode.h
+++ b/include/acpi/acopcode.h
@@ -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/include/acpi/acoutput.h b/include/acpi/acoutput.h
index 68d7edf0f697..7785d481dc3e 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -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
@@ -137,13 +137,19 @@
 /* Exception level -- used in the global "debug_level" */
-#define ACPI_DB_ERROR               ACPI_DEBUG_LEVEL (ACPI_LV_ERROR)
-#define ACPI_DB_WARN                ACPI_DEBUG_LEVEL (ACPI_LV_WARN)
 #define ACPI_DB_INIT                ACPI_DEBUG_LEVEL (ACPI_LV_INIT)
 #define ACPI_DB_DEBUG_OBJECT        ACPI_DEBUG_LEVEL (ACPI_LV_DEBUG_OBJECT)
 #define ACPI_DB_INFO                ACPI_DEBUG_LEVEL (ACPI_LV_INFO)
 #define ACPI_DB_ALL_EXCEPTIONS      ACPI_DEBUG_LEVEL (ACPI_LV_ALL_EXCEPTIONS)
+/*
+ * These two levels are essentially obsolete, all instances in the
+ * ACPICA core code have been replaced by REPORT_ERROR and REPORT_WARNING
+ * (Kept here because some drivers may still use them)
+ */
+#define ACPI_DB_ERROR               ACPI_DEBUG_LEVEL (ACPI_LV_ERROR)
+#define ACPI_DB_WARN                ACPI_DEBUG_LEVEL (ACPI_LV_WARN)
 /* Trace level -- also used in the global "debug_level" */
 #define ACPI_DB_INIT_NAMES          ACPI_DEBUG_LEVEL (ACPI_LV_INIT_NAMES)
diff --git a/include/acpi/acparser.h b/include/acpi/acparser.h
index d352d40de1f3..5a1ff484af33 100644
--- a/include/acpi/acparser.h
+++ b/include/acpi/acparser.h
@@ -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/include/acpi/acpi.h b/include/acpi/acpi.h
index ccf34f9dac64..b9a39d1009bd 100644
--- a/include/acpi/acpi.h
+++ b/include/acpi/acpi.h
@@ -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/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 58473f60755f..768f63f391cd 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -8,7 +8,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/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 2a88429bc4ec..66cf2ecef57a 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -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/include/acpi/acresrc.h b/include/acpi/acresrc.h
index ba281f7740a0..fa02e8083381 100644
--- a/include/acpi/acresrc.h
+++ b/include/acpi/acresrc.h
@@ -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/include/acpi/acstruct.h b/include/acpi/acstruct.h
index 99d235339801..d8c1c2cdac0c 100644
--- a/include/acpi/acstruct.h
+++ b/include/acpi/acstruct.h
@@ -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/include/acpi/actables.h b/include/acpi/actables.h
index f92c1858b808..30a47542e1c8 100644
--- a/include/acpi/actables.h
+++ b/include/acpi/actables.h
@@ -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/include/acpi/actbl.h b/include/acpi/actbl.h
index ef2ddcadfe61..ed53f842dad4 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -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/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 67312c3a915a..cd428d57add0 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -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/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 50305ce2681a..dfc7ac1094bb 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -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/include/acpi/actypes.h b/include/acpi/actypes.h
index 18e1338c5c7f..74819e9b4699 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -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/include/acpi/acutils.h b/include/acpi/acutils.h
index 5fa21e03a62f..10f6625f6390 100644
--- a/include/acpi/acutils.h
+++ b/include/acpi/acutils.h
@@ -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
@@ -275,12 +275,11 @@ acpi_ut_ptr_exit(u32 line_number,
                 const char *function_name,
                 char *module_name, u32 component_id, u8 * ptr);
-void acpi_ut_report_info(char *module_name, u32 line_number, u32 component_id);
+void acpi_ut_report_error(char *module_name, u32 line_number);
-void acpi_ut_report_error(char *module_name, u32 line_number, u32 component_id);
+void acpi_ut_report_info(char *module_name, u32 line_number);
-void
+void acpi_ut_report_warning(char *module_name, u32 line_number);
-acpi_ut_report_warning(char *module_name, u32 line_number, u32 component_id);
 void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id);
diff --git a/include/acpi/amlcode.h b/include/acpi/amlcode.h
index 7fdf5299f501..37964a59aef8 100644
--- a/include/acpi/amlcode.h
+++ b/include/acpi/amlcode.h
@@ -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
diff --git a/include/acpi/amlresrc.h b/include/acpi/amlresrc.h
index 2e3382c1e5e3..fb4735315ad3 100644
--- a/include/acpi/amlresrc.h
+++ b/include/acpi/amlresrc.h
@@ -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/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h
index 53aa997f05fc..31b0f18342f6 100644
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
@@ -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/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h
index 4c0e0ba09ba0..ea2a6322f64d 100644
--- a/include/acpi/platform/acgcc.h
+++ b/include/acpi/platform/acgcc.h
@@ -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/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 1b9cbf05b79e..c21c27fe7e1e 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -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