Merge branch 'acpi-misc'

[linux-2.6-microblaze.git] / drivers / acpi / processor_perflib.c

diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index e4032b7..d088a00 100644 (file)
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -63,14 +63,13 @@ static int acpi_processor_get_platform_limit(struct acpi_processor *pr)
         * (e.g. 0 = states 0..n; 1 = states 1..n; etc.
         */
        status = acpi_evaluate_integer(pr->handle, "_PPC", NULL, &ppc);
-
-       if (status != AE_NOT_FOUND)
+       if (status != AE_NOT_FOUND) {
                acpi_processor_ppc_in_use = true;
 
-       if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-               acpi_handle_warn(pr->handle, "_PPC evaluation failed: %s\n",
-                                acpi_format_exception(status));
-               return -ENODEV;
+               if (ACPI_FAILURE(status)) {
+                       acpi_evaluation_failure_warn(pr->handle, "_PPC", status);
+                       return -ENODEV;
+               }
        }
 
        pr_debug("CPU %d: _PPC is %d - frequency %s limited\n", pr->id,
@@ -97,7 +96,7 @@ static int acpi_processor_get_platform_limit(struct acpi_processor *pr)
  * acpi_processor_ppc_ost: Notify firmware the _PPC evaluation status
  * @handle: ACPI processor handle
  * @status: the status code of _PPC evaluation
- *     0: success. OSPM is now using the performance state specificed.
+ *     0: success. OSPM is now using the performance state specified.
  *     1: failure. OSPM has not changed the number of P-states in use
  */
 static void acpi_processor_ppc_ost(acpi_handle handle, int status)
@@ -198,8 +197,7 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)
 
        status = acpi_evaluate_object(pr->handle, "_PCT", NULL, &buffer);
        if (ACPI_FAILURE(status)) {
-               acpi_handle_warn(pr->handle, "_PCT evaluation failed: %s\n",
-                                acpi_format_exception(status));
+               acpi_evaluation_failure_warn(pr->handle, "_PCT", status);
                return -ENODEV;
        }
 
@@ -299,8 +297,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
 
        status = acpi_evaluate_object(pr->handle, "_PSS", NULL, &buffer);
        if (ACPI_FAILURE(status)) {
-               acpi_handle_warn(pr->handle, "_PSS evaluation failed: %s\n",
-                                acpi_format_exception(status));
+               acpi_evaluation_failure_warn(pr->handle, "_PSS", status);
                return -ENODEV;
        }