8 files changed, 126 insertions, 108 deletions

diff --git a/drivers/acpi/tables/tbconvrt.c b/drivers/acpi/tables/tbconvrt.c
index a03939399fa9..03b37d2223bc 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
@@ -501,8 +501,8 @@ acpi_status acpi_tb_convert_table_fadt(void)
          * at least as long as the version 1.0 FADT
          */
         if (acpi_gbl_FADT->length < sizeof(struct fadt_descriptor_rev1)) {
-                ACPI_REPORT_ERROR(("FADT is invalid, too short: 0x%X\n",
-                                   acpi_gbl_FADT->length));
+                ACPI_ERROR((AE_INFO, "FADT is invalid, too short: 0x%X",
+                            acpi_gbl_FADT->length));
                 return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH);
         }
 
@@ -517,7 +517,10 @@ acpi_status acpi_tb_convert_table_fadt(void)
                 if (acpi_gbl_FADT->length < sizeof(struct fadt_descriptor_rev2)) {
                         /* Length is too short to be a V2.0 table */
 
-                        ACPI_REPORT_WARNING(("Inconsistent FADT length (0x%X) and revision (0x%X), using FADT V1.0 portion of table\n", acpi_gbl_FADT->length, acpi_gbl_FADT->revision));
+                        ACPI_WARNING((AE_INFO,
+                                      "Inconsistent FADT length (0x%X) and revision (0x%X), using FADT V1.0 portion of table",
+                                      acpi_gbl_FADT->length,
+                                      acpi_gbl_FADT->revision));
 
                         acpi_tb_convert_fadt1(local_fadt,
                                               (void *)acpi_gbl_FADT);
@@ -554,7 +557,9 @@ acpi_status acpi_tb_convert_table_fadt(void)
         ACPI_DEBUG_PRINT((ACPI_DB_TABLES,
                           "Hex dump of common internal FADT, size %d (%X)\n",
                           acpi_gbl_FADT->length, acpi_gbl_FADT->length));
-        ACPI_DUMP_BUFFER((u8 *) (acpi_gbl_FADT), acpi_gbl_FADT->length);
+
+        ACPI_DUMP_BUFFER(ACPI_CAST_PTR(u8, acpi_gbl_FADT),
+                         acpi_gbl_FADT->length);
 
         return_ACPI_STATUS(AE_OK);
 }
@@ -580,13 +585,15 @@ acpi_status acpi_tb_build_common_facs(struct acpi_table_desc *table_info)
         /* Absolute minimum length is 24, but the ACPI spec says 64 */
 
         if (acpi_gbl_FACS->length < 24) {
-                ACPI_REPORT_ERROR(("Invalid FACS table length: 0x%X\n",
-                                   acpi_gbl_FACS->length));
+                ACPI_ERROR((AE_INFO, "Invalid FACS table length: 0x%X",
+                            acpi_gbl_FACS->length));
                 return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH);
         }
 
         if (acpi_gbl_FACS->length < 64) {
-                ACPI_REPORT_WARNING(("FACS is shorter than the ACPI specification allows: 0x%X, using anyway\n", acpi_gbl_FACS->length));
+                ACPI_WARNING((AE_INFO,
+                              "FACS is shorter than the ACPI specification allows: 0x%X, using anyway",
+                              acpi_gbl_FACS->length));
         }
 
         /* Copy fields to the new FACS */
diff --git a/drivers/acpi/tables/tbget.c b/drivers/acpi/tables/tbget.c
index 6acd5aeb093e..09b4ee6dfd60 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
@@ -91,9 +91,9 @@ acpi_tb_get_table(struct acpi_pointer *address,
 
         status = acpi_tb_get_table_body(address, &header, table_info);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not get ACPI table (size %X), %s\n",
-                                   header.length,
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not get ACPI table (size %X)",
+                                header.length));
                 return_ACPI_STATUS(status);
         }
 
@@ -148,7 +148,6 @@ acpi_tb_get_table_header(struct acpi_pointer *address,
                                             sizeof(struct acpi_table_header),
                                             (void *)&header);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("Could not map memory at %8.8X%8.8X for length %X\n", ACPI_FORMAT_UINT64(address->pointer.physical), sizeof(struct acpi_table_header)));
                         return_ACPI_STATUS(status);
                 }
 
@@ -161,8 +160,8 @@ acpi_tb_get_table_header(struct acpi_pointer *address,
 
         default:
 
-                ACPI_REPORT_ERROR(("Invalid address flags %X\n",
-                                   address->pointer_type));
+                ACPI_ERROR((AE_INFO, "Invalid address flags %X",
+                            address->pointer_type));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -253,8 +252,8 @@ acpi_tb_table_override(struct acpi_table_header *header,
         if (ACPI_FAILURE(status)) {
                 /* Some severe error from the OSL, but we basically ignore it */
 
-                ACPI_REPORT_ERROR(("Could not override ACPI table, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not override ACPI table"));
                 return_ACPI_STATUS(status);
         }
 
@@ -273,15 +272,14 @@ acpi_tb_table_override(struct acpi_table_header *header,
 
         status = acpi_tb_get_this_table(&address, new_table, table_info);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not copy override ACPI table, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "Could not copy ACPI table"));
                 return_ACPI_STATUS(status);
         }
 
         /* Copy the table info */
 
-        ACPI_REPORT_INFO(("Table [%4.4s] replaced by host OS\n",
-                          table_info->pointer->signature));
+        ACPI_INFO((AE_INFO, "Table [%4.4s] replaced by host OS",
+                   table_info->pointer->signature));
 
         return_ACPI_STATUS(AE_OK);
 }
@@ -327,7 +325,9 @@ acpi_tb_get_this_table(struct acpi_pointer *address,
 
                 full_table = ACPI_MEM_ALLOCATE(header->length);
                 if (!full_table) {
-                        ACPI_REPORT_ERROR(("Could not allocate table memory for [%4.4s] length %X\n", header->signature, header->length));
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not allocate table memory for [%4.4s] length %X",
+                                    header->signature, header->length));
                         return_ACPI_STATUS(AE_NO_MEMORY);
                 }
 
@@ -351,7 +351,12 @@ acpi_tb_get_this_table(struct acpi_pointer *address,
                                             (acpi_size) header->length,
                                             (void *)&full_table);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("Could not map memory for table [%4.4s] at %8.8X%8.8X for length %X\n", header->signature, ACPI_FORMAT_UINT64(address->pointer.physical), header->length));
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not map memory for table [%4.4s] at %8.8X%8.8X for length %X",
+                                    header->signature,
+                                    ACPI_FORMAT_UINT64(address->pointer.
+                                                       physical),
+                                    header->length));
                         return (status);
                 }
 
@@ -362,8 +367,8 @@ acpi_tb_get_this_table(struct acpi_pointer *address,
 
         default:
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid address flags %X\n",
-                                  address->pointer_type));
+                ACPI_ERROR((AE_INFO, "Invalid address flags %X",
+                            address->pointer_type));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
diff --git a/drivers/acpi/tables/tbgetall.c b/drivers/acpi/tables/tbgetall.c
index 8d72343537e7..134e5dce0bc1 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
@@ -152,7 +152,9 @@ acpi_tb_get_secondary_table(struct acpi_pointer *address,
         /* Signature must match request */
 
         if (ACPI_STRNCMP(header.signature, signature, ACPI_NAME_SIZE)) {
-                ACPI_REPORT_ERROR(("Incorrect table signature - wanted [%s] found [%4.4s]\n", signature, header.signature));
+                ACPI_ERROR((AE_INFO,
+                            "Incorrect table signature - wanted [%s] found [%4.4s]",
+                            signature, header.signature));
                 return_ACPI_STATUS(AE_BAD_SIGNATURE);
         }
 
@@ -231,14 +233,18 @@ acpi_status acpi_tb_get_required_tables(void)
                  */
                 status = acpi_tb_get_primary_table(&address, &table_info);
                 if ((status != AE_OK) && (status != AE_TABLE_NOT_SUPPORTED)) {
-                        ACPI_REPORT_WARNING(("%s, while getting table at %8.8X%8.8X\n", acpi_format_exception(status), ACPI_FORMAT_UINT64(address.pointer.value)));
+                        ACPI_WARNING((AE_INFO,
+                                      "%s, while getting table at %8.8X%8.8X",
+                                      acpi_format_exception(status),
+                                      ACPI_FORMAT_UINT64(address.pointer.
+                                                         value)));
                 }
         }
 
         /* We must have a FADT to continue */
 
         if (!acpi_gbl_FADT) {
-                ACPI_REPORT_ERROR(("No FADT present in RSDT/XSDT\n"));
+                ACPI_ERROR((AE_INFO, "No FADT present in RSDT/XSDT"));
                 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
         }
 
@@ -248,7 +254,8 @@ acpi_status acpi_tb_get_required_tables(void)
          */
         status = acpi_tb_convert_table_fadt();
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not convert FADT to internal common format\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Could not convert FADT to internal common format"));
                 return_ACPI_STATUS(status);
         }
 
@@ -258,8 +265,8 @@ acpi_status acpi_tb_get_required_tables(void)
 
         status = acpi_tb_get_secondary_table(&address, FACS_SIG, &table_info);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not get/install the FACS, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not get/install the FACS"));
                 return_ACPI_STATUS(status);
         }
 
@@ -278,7 +285,7 @@ acpi_status acpi_tb_get_required_tables(void)
 
         status = acpi_tb_get_secondary_table(&address, DSDT_SIG, &table_info);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not get/install the DSDT\n"));
+                ACPI_ERROR((AE_INFO, "Could not get/install the DSDT"));
                 return_ACPI_STATUS(status);
         }
 
@@ -292,7 +299,9 @@ acpi_status acpi_tb_get_required_tables(void)
                           "Hex dump of entire DSDT, size %d (0x%X), Integer width = %d\n",
                           acpi_gbl_DSDT->length, acpi_gbl_DSDT->length,
                           acpi_gbl_integer_bit_width));
-        ACPI_DUMP_BUFFER((u8 *) acpi_gbl_DSDT, acpi_gbl_DSDT->length);
+
+        ACPI_DUMP_BUFFER(ACPI_CAST_PTR(u8, acpi_gbl_DSDT),
+                         acpi_gbl_DSDT->length);
 
         /* Always delete the RSDP mapping, we are done with it */
 
diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c
index 10db8484e462..7ffd0fddb4e5 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
@@ -128,8 +128,8 @@ acpi_status acpi_tb_install_table(struct acpi_table_desc *table_info)
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not acquire table mutex, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not acquire table mutex"));
                 return_ACPI_STATUS(status);
         }
 
@@ -146,9 +146,9 @@ acpi_status acpi_tb_install_table(struct acpi_table_desc *table_info)
 
         status = acpi_tb_init_table_descriptor(table_info->type, table_info);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not install table [%4.4s], %s\n",
-                                   table_info->pointer->signature,
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not install table [%4.4s]",
+                                table_info->pointer->signature));
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s located at %p\n",
diff --git a/drivers/acpi/tables/tbrsdt.c b/drivers/acpi/tables/tbrsdt.c
index ad0252c2f7db..4d308220225d 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,24 +192,24 @@ 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_ERROR((AE_INFO,
+                            "Invalid signature where RSDP indicates RSDT/XSDT should be located. RSDP:"));
 
                 ACPI_DUMP_BUFFER(acpi_gbl_RSDP, 20);
 
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_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));
+                ACPI_ERROR((AE_INFO,
+                            "RSDT/XSDT signature at %X (%p) is invalid",
+                            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"))
+                        ACPI_ERROR((AE_INFO, "Looking for RSDT"));
                 } else {
-                        ACPI_REPORT_ERROR(("Looking for XSDT\n"))
+                        ACPI_ERROR((AE_INFO, "Looking for XSDT"));
                 }
 
                 ACPI_DUMP_BUFFER((char *)table_ptr, 48);
-
                 return (AE_BAD_SIGNATURE);
         }
 
@@ -243,15 +243,13 @@ 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,
-                                  "Could not get the RSDT/XSDT, %s\n",
-                                  acpi_format_exception(status)));
-
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not get the RSDT/XSDT"));
                 return_ACPI_STATUS(status);
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "RSDP located at %p, points to RSDT physical=%8.8X%8.8X \n",
+                          "RSDP located at %p, points to RSDT physical=%8.8X%8.8X\n",
                           acpi_gbl_RSDP,
                           ACPI_FORMAT_UINT64(address.pointer.value)));
 
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index 4b2fbb592f49..bc571592f087 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
@@ -94,9 +94,8 @@ acpi_status acpi_tb_is_table_installed(struct acpi_table_desc *new_table_desc)
                      new_table_desc->pointer->length)
                     &&
                     (!ACPI_MEMCMP
-                     ((const char *)table_desc->pointer,
-                      (const char *)new_table_desc->pointer,
-                      (acpi_size) new_table_desc->pointer->length))) {
+                     (table_desc->pointer, new_table_desc->pointer,
+                      new_table_desc->pointer->length))) {
                         /* Match: this table is already installed */
 
                         ACPI_DEBUG_PRINT((ACPI_DB_TABLES,
@@ -145,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,
-                                  "Cannot read table header at %p\n",
-                                  table_header));
+                ACPI_ERROR((AE_INFO,
+                            "Cannot read table header at %p", table_header));
 
                 return (AE_BAD_ADDRESS);
         }
@@ -161,12 +159,12 @@ 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,
-                                  "Table signature at %p [%p] has invalid characters\n",
-                                  table_header, &signature));
+                ACPI_ERROR((AE_INFO,
+                            "Table signature at %p [%p] has invalid characters",
+                            table_header, &signature));
 
-                ACPI_REPORT_WARNING(("Invalid table signature found: [%4.4s]\n",
-                                     (char *)&signature));
+                ACPI_WARNING((AE_INFO, "Invalid table signature found: [%4.4s]",
+                              ACPI_CAST_PTR(char, &signature)));
 
                 ACPI_DUMP_BUFFER(table_header,
                                  sizeof(struct acpi_table_header));
@@ -176,11 +174,13 @@ 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,
-                                  "Invalid length in table header %p name %4.4s\n",
-                                  table_header, (char *)&signature));
+                ACPI_ERROR((AE_INFO,
+                            "Invalid length in table header %p name %4.4s",
+                            table_header, (char *)&signature));
 
-                ACPI_REPORT_WARNING(("Invalid table header length (0x%X) found\n", (u32) table_header->length));
+                ACPI_WARNING((AE_INFO,
+                              "Invalid table header length (0x%X) found",
+                              (u32) table_header->length));
 
                 ACPI_DUMP_BUFFER(table_header,
                                  sizeof(struct acpi_table_header));
@@ -219,7 +219,10 @@ acpi_tb_verify_table_checksum(struct acpi_table_header * table_header)
         /* Return the appropriate exception */
 
         if (checksum) {
-                ACPI_REPORT_WARNING(("Invalid checksum in table [%4.4s] (%02X, sum %02X is not zero)\n", table_header->signature, (u32) table_header->checksum, (u32) checksum));
+                ACPI_WARNING((AE_INFO,
+                              "Invalid checksum in table [%4.4s] (%02X, sum %02X is not zero)",
+                              table_header->signature,
+                              (u32) table_header->checksum, (u32) checksum));
 
                 status = AE_BAD_CHECKSUM;
         }
@@ -241,16 +244,16 @@ acpi_tb_verify_table_checksum(struct acpi_table_header * table_header)
 
 u8 acpi_tb_generate_checksum(void *buffer, u32 length)
 {
-        const u8 *limit;
-        const u8 *rover;
+        u8 *end_buffer;
+        u8 *rover;
         u8 sum = 0;
 
         if (buffer && length) {
                 /*  Buffer and Length are valid   */
 
-                limit = (u8 *) buffer + length;
+                end_buffer = ACPI_ADD_PTR(u8, buffer, length);
 
-                for (rover = buffer; rover < limit; rover++) {
+                for (rover = buffer; rover < end_buffer; rover++) {
                         sum = (u8) (sum + *rover);
                 }
         }
@@ -292,8 +295,7 @@ acpi_tb_handle_to_object(u16 table_id,
                 }
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "table_id=%X does not exist\n",
-                          table_id));
+        ACPI_ERROR((AE_INFO, "table_id=%X does not exist", table_id));
         return (AE_BAD_PARAMETER);
 }
 #endif
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index 3f96a4909aad..9fe53c9d5b9a 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,8 +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_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "Could not get the RSDP"));
                 goto error_exit;
         }
 
@@ -86,7 +85,7 @@ 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_EXCEPTION((AE_INFO, status, "During RSDP validation"));
                 goto error_exit;
         }
 
@@ -94,7 +93,7 @@ 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_EXCEPTION((AE_INFO, status, "Could not load RSDT"));
                 goto error_exit;
         }
 
@@ -102,7 +101,8 @@ 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_EXCEPTION((AE_INFO, status,
+                                "Could not get all required tables (DSDT/FADT/FACS)"));
                 goto error_exit;
         }
 
@@ -112,16 +112,14 @@ 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_EXCEPTION((AE_INFO, status, "Could not load namespace"));
                 goto error_exit;
         }
 
         return_ACPI_STATUS(AE_OK);
 
       error_exit:
-        ACPI_REPORT_ERROR(("acpi_load_tables: Could not load tables: %s\n",
-                           acpi_format_exception(status)));
-
+        ACPI_EXCEPTION((AE_INFO, status, "Could not load tables"));
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c
index 3b8a7e063e8a..a62db6af83c9 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
@@ -251,7 +251,7 @@ acpi_get_firmware_table(acpi_string signature,
 
         acpi_tb_get_rsdt_address(&address);
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "RSDP located at %p, RSDT physical=%8.8X%8.8X \n",
+                          "RSDP located at %p, RSDT physical=%8.8X%8.8X\n",
                           acpi_gbl_RSDP,
                           ACPI_FORMAT_UINT64(address.pointer.value)));
 
@@ -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,
-                                  "RSDP structure not found, %s Flags=%X\n",
-                                  acpi_format_exception(status), flags));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "RSDP structure not found - Flags=%X", flags));
 
                 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
         }
@@ -503,10 +502,10 @@ 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,
-                                          "Could not map memory at %8.8X for length %X\n",
-                                          ACPI_EBDA_PTR_LOCATION,
-                                          ACPI_EBDA_PTR_LENGTH));
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not map memory at %8.8X for length %X",
+                                    ACPI_EBDA_PTR_LOCATION,
+                                    ACPI_EBDA_PTR_LENGTH));
 
                         return_ACPI_STATUS(status);
                 }
@@ -530,10 +529,10 @@ 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,
-                                                  "Could not map memory at %8.8X for length %X\n",
-                                                  physical_address,
-                                                  ACPI_EBDA_WINDOW_SIZE));
+                                ACPI_ERROR((AE_INFO,
+                                            "Could not map memory at %8.8X for length %X",
+                                            physical_address,
+                                            ACPI_EBDA_WINDOW_SIZE));
 
                                 return_ACPI_STATUS(status);
                         }
@@ -563,10 +562,10 @@ 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,
-                                          "Could not map memory at %8.8X for length %X\n",
-                                          ACPI_HI_RSDP_WINDOW_BASE,
-                                          ACPI_HI_RSDP_WINDOW_SIZE));
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not map memory at %8.8X for length %X",
+                                    ACPI_HI_RSDP_WINDOW_BASE,
+                                    ACPI_HI_RSDP_WINDOW_SIZE));
 
                         return_ACPI_STATUS(status);
                 }
@@ -635,7 +634,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
 
         /* A valid RSDP was not found */
 
-        ACPI_REPORT_ERROR(("No valid RSDP was found\n"));
+        ACPI_ERROR((AE_INFO, "No valid RSDP was found"));
         return_ACPI_STATUS(AE_NOT_FOUND);
 }