ACPI / processor_idle: replace PREFIX with pr_fmt

Like few of the other ACPI modules, replace PREFIX with pr_fmt and
change all the printk call sites to use pr_* companion functions
in processor_idle.

Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 175c86b..e057aa8 100644 (file)
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -23,6 +23,7 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
+#define pr_fmt(fmt) "ACPI: " fmt
 
 #include <linux/module.h>
 #include <linux/acpi.h>
@@ -43,8 +44,6 @@
 #include <asm/apic.h>
 #endif
 
-#define PREFIX "ACPI: "
-
 #define ACPI_PROCESSOR_CLASS            "processor"
 #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
 ACPI_MODULE_NAME("processor_idle");
@@ -81,9 +80,9 @@ static int set_max_cstate(const struct dmi_system_id *id)
        if (max_cstate > ACPI_PROCESSOR_MAX_POWER)
                return 0;
 
-       printk(KERN_NOTICE PREFIX "%s detected - limiting to C%ld max_cstate."
-              " Override with \"processor.max_cstate=%d\"\n", id->ident,
-              (long)id->driver_data, ACPI_PROCESSOR_MAX_POWER + 1);
+       pr_notice("%s detected - limiting to C%ld max_cstate."
+                 " Override with \"processor.max_cstate=%d\"\n", id->ident,
+                 (long)id->driver_data, ACPI_PROCESSOR_MAX_POWER + 1);
 
        max_cstate = (long)id->driver_data;
 
@@ -351,7 +350,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 
        /* There must be at least 2 elements */
        if (!cst || (cst->type != ACPI_TYPE_PACKAGE) || cst->package.count < 2) {
-               printk(KERN_ERR PREFIX "not enough elements in _CST\n");
+               pr_err("not enough elements in _CST\n");
                ret = -EFAULT;
                goto end;
        }
@@ -360,7 +359,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 
        /* Validate number of power states. */
        if (count < 1 || count != cst->package.count - 1) {
-               printk(KERN_ERR PREFIX "count given by _CST is not valid\n");
+               pr_err("count given by _CST is not valid\n");
                ret = -EFAULT;
                goto end;
        }
@@ -469,11 +468,9 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                 * (From 1 through ACPI_PROCESSOR_MAX_POWER - 1)
                 */
                if (current_count >= (ACPI_PROCESSOR_MAX_POWER - 1)) {
-                       printk(KERN_WARNING
-                              "Limiting number of power states to max (%d)\n",
-                              ACPI_PROCESSOR_MAX_POWER);
-                       printk(KERN_WARNING
-                              "Please increase ACPI_PROCESSOR_MAX_POWER if needed.\n");
+                       pr_warn("Limiting number of power states to max (%d)\n",
+                               ACPI_PROCESSOR_MAX_POWER);
+                       pr_warn("Please increase ACPI_PROCESSOR_MAX_POWER if needed.\n");
                        break;
                }
        }
@@ -1097,8 +1094,8 @@ int acpi_processor_power_init(struct acpi_processor *pr)
                        retval = cpuidle_register_driver(&acpi_idle_driver);
                        if (retval)
                                return retval;
-                       printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
-                                       acpi_idle_driver.name);
+                       pr_debug("%s registered with cpuidle\n",
+                                acpi_idle_driver.name);
                }
 
                dev = kzalloc(sizeof(*dev), GFP_KERNEL);