3 files changed, 44 insertions, 34 deletions

diff --git a/drivers/acpi/hardware/hwacpi.c b/drivers/acpi/hardware/hwacpi.c
index 5c068cc4f674..ea2f13271ff1 100644
--- a/drivers/acpi/hardware/hwacpi.c
+++ b/drivers/acpi/hardware/hwacpi.c
@@ -68,7 +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_REPORT_ERROR(("No FADT is present\n"));
+                ACPI_ERROR((AE_INFO, "No FADT is present"));
                 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
         }
 
@@ -107,7 +107,8 @@ 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_ERROR((AE_INFO,
+                            "No SMI_CMD in FADT, mode transition failed"));
                 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
         }
 
@@ -119,7 +120,8 @@ acpi_status acpi_hw_set_mode(u32 mode)
          * transitions are not supported.
          */
         if (!acpi_gbl_FADT->acpi_enable && !acpi_gbl_FADT->acpi_disable) {
-                ACPI_REPORT_ERROR(("No ACPI mode transition supported in this system (enable/disable both zero)\n"));
+                ACPI_ERROR((AE_INFO,
+                            "No ACPI mode transition supported in this system (enable/disable both zero)"));
                 return_ACPI_STATUS(AE_OK);
         }
 
@@ -153,8 +155,8 @@ acpi_status acpi_hw_set_mode(u32 mode)
         }
 
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not write mode change, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not write ACPI mode change"));
                 return_ACPI_STATUS(status);
         }
 
@@ -174,7 +176,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
                 retry--;
         }
 
-        ACPI_REPORT_ERROR(("Hardware never changed modes\n"));
+        ACPI_ERROR((AE_INFO, "Hardware did not change modes"));
         return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
 }
 
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c
index b4b50a3d1705..e1fe75498415 100644
--- a/drivers/acpi/hardware/hwregs.c
+++ b/drivers/acpi/hardware/hwregs.c
@@ -160,15 +160,16 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
         /* Must have a return object */
 
         if (!info.return_object) {
-                ACPI_REPORT_ERROR(("No Sleep State object returned from [%s]\n",
-                                   sleep_state_name));
+                ACPI_ERROR((AE_INFO, "No Sleep State object returned from [%s]",
+                            sleep_state_name));
                 status = AE_NOT_EXIST;
         }
 
         /* It must be of type Package */
 
         else if (ACPI_GET_OBJECT_TYPE(info.return_object) != ACPI_TYPE_PACKAGE) {
-                ACPI_REPORT_ERROR(("Sleep State return object is not a Package\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Sleep State return object is not a Package"));
                 status = AE_AML_OPERAND_TYPE;
         }
 
@@ -180,7 +181,8 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
          * one per sleep type (A/B).
          */
         else if (info.return_object->package.count < 2) {
-                ACPI_REPORT_ERROR(("Sleep State return package does not have at least two elements\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Sleep State return package does not have at least two elements"));
                 status = AE_AML_NO_OPERAND;
         }
 
@@ -190,7 +192,12 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
                   != ACPI_TYPE_INTEGER) ||
                  (ACPI_GET_OBJECT_TYPE(info.return_object->package.elements[1])
                   != ACPI_TYPE_INTEGER)) {
-                ACPI_REPORT_ERROR(("Sleep State return package elements are not both Integers (%s, %s)\n", acpi_ut_get_object_type_name(info.return_object->package.elements[0]), acpi_ut_get_object_type_name(info.return_object->package.elements[1])));
+                ACPI_ERROR((AE_INFO,
+                            "Sleep State return package elements are not both Integers (%s, %s)",
+                            acpi_ut_get_object_type_name(info.return_object->
+                                                         package.elements[0]),
+                            acpi_ut_get_object_type_name(info.return_object->
+                                                         package.elements[1])));
                 status = AE_AML_OPERAND_TYPE;
         } else {
                 /* Valid _Sx_ package size, type, and value */
@@ -202,7 +209,11 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
         }
 
         if (ACPI_FAILURE(status)) {
-                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)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "While evaluating sleep_state [%s], bad Sleep object %p type %s",
+                                sleep_state_name, info.return_object,
+                                acpi_ut_get_object_type_name(info.
+                                                             return_object)));
         }
 
         acpi_ut_remove_reference(info.return_object);
@@ -228,8 +239,8 @@ struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id)
         ACPI_FUNCTION_ENTRY();
 
         if (register_id > ACPI_BITREG_MAX) {
-                ACPI_REPORT_ERROR(("Invalid bit_register ID: %X\n",
-                                   register_id));
+                ACPI_ERROR((AE_INFO, "Invalid bit_register ID: %X",
+                            register_id));
                 return (NULL);
         }
 
@@ -329,8 +340,8 @@ acpi_status acpi_set_register(u32 register_id, u32 value, u32 flags)
 
         bit_reg_info = acpi_hw_get_bit_register_info(register_id);
         if (!bit_reg_info) {
-                ACPI_REPORT_ERROR(("Bad ACPI HW register_id: %X\n",
-                                   register_id));
+                ACPI_ERROR((AE_INFO, "Bad ACPI HW register_id: %X",
+                            register_id));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -564,7 +575,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
                 break;
 
         default:
-                ACPI_REPORT_ERROR(("Unknown Register ID: %X\n", register_id));
+                ACPI_ERROR((AE_INFO, "Unknown Register ID: %X", register_id));
                 status = AE_BAD_PARAMETER;
                 break;
         }
@@ -759,8 +770,9 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)
                 break;
 
         default:
-                ACPI_REPORT_ERROR(("Unsupported address space: %X\n",
-                                   reg->address_space_id));
+                ACPI_ERROR((AE_INFO,
+                            "Unsupported address space: %X",
+                            reg->address_space_id));
                 return (AE_BAD_PARAMETER);
         }
 
@@ -829,8 +841,9 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)
                 break;
 
         default:
-                ACPI_REPORT_ERROR(("Unsupported address space: %X\n",
-                                   reg->address_space_id));
+                ACPI_ERROR((AE_INFO,
+                            "Unsupported address space: %X",
+                            reg->address_space_id));
                 return (AE_BAD_PARAMETER);
         }
 
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 992128d71117..89269272fd62 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -199,8 +199,8 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
 
         status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_REPORT_ERROR(("Method _SST failed, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "While executing method _SST"));
         }
 
         return_ACPI_STATUS(AE_OK);
@@ -232,9 +232,8 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
 
         if ((acpi_gbl_sleep_type_a > ACPI_SLEEP_TYPE_MAX) ||
             (acpi_gbl_sleep_type_b > ACPI_SLEEP_TYPE_MAX)) {
-                ACPI_REPORT_ERROR(("Sleep values out of range: A=%X B=%X\n",
-                                   acpi_gbl_sleep_type_a,
-                                   acpi_gbl_sleep_type_b));
+                ACPI_ERROR((AE_INFO, "Sleep values out of range: A=%X B=%X",
+                            acpi_gbl_sleep_type_a, acpi_gbl_sleep_type_b));
                 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
         }
 
@@ -533,21 +532,18 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
         arg.integer.value = ACPI_SST_WAKING;
         status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_REPORT_ERROR(("Method _SST failed, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During Method _SST"));
         }
 
         arg.integer.value = sleep_state;
         status = acpi_evaluate_object(NULL, METHOD_NAME__BFS, &arg_list, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_REPORT_ERROR(("Method _BFS failed, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));
         }
 
         status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_REPORT_ERROR(("Method _WAK failed, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
         }
         /* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */
 
@@ -582,8 +578,7 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
         arg.integer.value = ACPI_SST_WORKING;
         status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_REPORT_ERROR(("Method _SST failed, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During Method _SST"));
         }
 
         return_ACPI_STATUS(status);