ARM: convert printk(KERN_* to pr_*

Convert many (but not all) printk(KERN_* to pr_* to simplify the code.
We take the opportunity to join some printk lines together so we don't
split the message across several lines, and we also add a few levels
to some messages which were previously missing them.

Tested-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index 93090213c71c..172c6a05d27f 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -199,7 +199,7 @@ static void twd_calibrate_rate(void)
          * the timer ticks
          */
         if (twd_timer_rate == 0) {
-                printk(KERN_INFO "Calibrating local timer... ");
+                pr_info("Calibrating local timer... ");
 
                 /* Wait for a tick to start */
                 waitjiffies = get_jiffies_64() + 1;
@@ -223,7 +223,7 @@ static void twd_calibrate_rate(void)
 
                 twd_timer_rate = (0xFFFFFFFFU - count) * (HZ / 5);
 
-                printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000,
+                pr_cont("%lu.%02luMHz.\n", twd_timer_rate / 1000000,
                         (twd_timer_rate / 10000) % 100);
         }
 }