[ACPI] ACPICA 20060127

[sfrench/cifs-2.6.git] / drivers / acpi / tables / tbxfroot.c

diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c
index 6538ed818f5be92a5f534838d19c8e7c19698ca5..a62db6af83c9139ad8ab02871862db6eeef9af90 100644 (file)
--- a/drivers/acpi/tables/tbxfroot.c
+++ b/drivers/acpi/tables/tbxfroot.c
@@ -396,8 +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_REPORT_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);
        }
@@ -502,7 +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_REPORT_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);
                }
@@ -526,7 +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_REPORT_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);
                        }
@@ -556,7 +562,10 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
                                            (void *)&table_ptr);
 
                if (ACPI_FAILURE(status)) {
-                       ACPI_REPORT_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);
                }
@@ -625,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);
 }