cpufreq: Convert printk(KERN_<LEVEL> to pr_<level>

Use the more common logging style.

Miscellanea:

o Coalesce formats
o Realign arguments
o Add a missing space between a coalesced format

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

1 files changed, 20 insertions, 23 deletions

diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c
index 4ff86878727f..5ffe0855ba8f 100644
--- a/drivers/cpufreq/pmac64-cpufreq.c
+++ b/drivers/cpufreq/pmac64-cpufreq.c
@@ -138,7 +138,7 @@ static void g5_vdnap_switch_volt(int speed_mode)
                 usleep_range(1000, 1000);
         }
         if (done == 0)
-                printk(KERN_WARNING "cpufreq: Timeout in clock slewing !\n");
+                pr_warn("cpufreq: Timeout in clock slewing !\n");
 }
 
 
@@ -266,7 +266,7 @@ static int g5_pfunc_switch_freq(int speed_mode)
                 rc = pmf_call_one(pfunc_cpu_setfreq_low, NULL);
 
         if (rc)
-                printk(KERN_WARNING "cpufreq: pfunc switch error %d\n", rc);
+                pr_warn("cpufreq: pfunc switch error %d\n", rc);
 
         /* It's an irq GPIO so we should be able to just block here,
          * I'll do that later after I've properly tested the IRQ code for
@@ -282,7 +282,7 @@ static int g5_pfunc_switch_freq(int speed_mode)
                 usleep_range(500, 500);
         }
         if (done == 0)
-                printk(KERN_WARNING "cpufreq: Timeout in clock slewing !\n");
+                pr_warn("cpufreq: Timeout in clock slewing !\n");
 
         /* If frequency is going down, last ramp the voltage */
         if (speed_mode > g5_pmode_cur)
@@ -368,7 +368,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpunode)
         }
         pvr_hi = (*valp) >> 16;
         if (pvr_hi != 0x3c && pvr_hi != 0x44) {
-                printk(KERN_ERR "cpufreq: Unsupported CPU version\n");
+                pr_err("cpufreq: Unsupported CPU version\n");
                 goto bail_noprops;
         }
 
@@ -403,8 +403,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpunode)
 
                 root = of_find_node_by_path("/");
                 if (root == NULL) {
-                        printk(KERN_ERR "cpufreq: Can't find root of "
-                               "device tree\n");
+                        pr_err("cpufreq: Can't find root of device tree\n");
                         goto bail_noprops;
                 }
                 pfunc_set_vdnap0 = pmf_find_function(root, "set-vdnap0");
@@ -412,8 +411,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpunode)
                         pmf_find_function(root, "slewing-done");
                 if (pfunc_set_vdnap0 == NULL ||
                     pfunc_vdnap0_complete == NULL) {
-                        printk(KERN_ERR "cpufreq: Can't find required "
-                               "platform function\n");
+                        pr_err("cpufreq: Can't find required platform function\n");
                         goto bail_noprops;
                 }
 
@@ -453,10 +451,10 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpunode)
         g5_pmode_cur = -1;
         g5_switch_freq(g5_query_freq());
 
-        printk(KERN_INFO "Registering G5 CPU frequency driver\n");
-        printk(KERN_INFO "Frequency method: %s, Voltage method: %s\n",
-               freq_method, volt_method);
-        printk(KERN_INFO "Low: %d Mhz, High: %d Mhz, Cur: %d MHz\n",
+        pr_info("Registering G5 CPU frequency driver\n");
+        pr_info("Frequency method: %s, Voltage method: %s\n",
+                freq_method, volt_method);
+        pr_info("Low: %d Mhz, High: %d Mhz, Cur: %d MHz\n",
                 g5_cpu_freqs[1].frequency/1000,
                 g5_cpu_freqs[0].frequency/1000,
                 g5_cpu_freqs[g5_pmode_cur].frequency/1000);
@@ -493,7 +491,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
         if (cpuid != NULL)
                 eeprom = of_get_property(cpuid, "cpuid", NULL);
         if (eeprom == NULL) {
-                printk(KERN_ERR "cpufreq: Can't find cpuid EEPROM !\n");
+                pr_err("cpufreq: Can't find cpuid EEPROM !\n");
                 rc = -ENODEV;
                 goto bail;
         }
@@ -511,7 +509,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
                 break;
         }
         if (hwclock == NULL) {
-                printk(KERN_ERR "cpufreq: Can't find i2c clock chip !\n");
+                pr_err("cpufreq: Can't find i2c clock chip !\n");
                 rc = -ENODEV;
                 goto bail;
         }
@@ -539,7 +537,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
         /* Check we have minimum requirements */
         if (pfunc_cpu_getfreq == NULL || pfunc_cpu_setfreq_high == NULL ||
             pfunc_cpu_setfreq_low == NULL || pfunc_slewing_done == NULL) {
-                printk(KERN_ERR "cpufreq: Can't find platform functions !\n");
+                pr_err("cpufreq: Can't find platform functions !\n");
                 rc = -ENODEV;
                 goto bail;
         }
@@ -567,7 +565,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
         /* Get max frequency from device-tree */
         valp = of_get_property(cpunode, "clock-frequency", NULL);
         if (!valp) {
-                printk(KERN_ERR "cpufreq: Can't find CPU frequency !\n");
+                pr_err("cpufreq: Can't find CPU frequency !\n");
                 rc = -ENODEV;
                 goto bail;
         }
@@ -583,8 +581,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
 
         /* Check for machines with no useful settings */
         if (il == ih) {
-                printk(KERN_WARNING "cpufreq: No low frequency mode available"
-                       " on this model !\n");
+                pr_warn("cpufreq: No low frequency mode available on this model !\n");
                 rc = -ENODEV;
                 goto bail;
         }
@@ -595,7 +592,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
 
         /* Sanity check */
         if (min_freq >= max_freq || min_freq < 1000) {
-                printk(KERN_ERR "cpufreq: Can't calculate low frequency !\n");
+                pr_err("cpufreq: Can't calculate low frequency !\n");
                 rc = -ENXIO;
                 goto bail;
         }
@@ -619,10 +616,10 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
         g5_pmode_cur = -1;
         g5_switch_freq(g5_query_freq());
 
-        printk(KERN_INFO "Registering G5 CPU frequency driver\n");
-        printk(KERN_INFO "Frequency method: i2c/pfunc, "
-               "Voltage method: %s\n", has_volt ? "i2c/pfunc" : "none");
-        printk(KERN_INFO "Low: %d Mhz, High: %d Mhz, Cur: %d MHz\n",
+        pr_info("Registering G5 CPU frequency driver\n");
+        pr_info("Frequency method: i2c/pfunc, Voltage method: %s\n",
+                has_volt ? "i2c/pfunc" : "none");
+        pr_info("Low: %d Mhz, High: %d Mhz, Cur: %d MHz\n",
                 g5_cpu_freqs[1].frequency/1000,
                 g5_cpu_freqs[0].frequency/1000,
                 g5_cpu_freqs[g5_pmode_cur].frequency/1000);