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, 3 insertions, 3 deletions

diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c
index ff379ac115df..d9e0d00a6699 100644
--- a/arch/arm/mm/fault-armv.c
+++ b/arch/arm/mm/fault-armv.c
@@ -235,7 +235,7 @@ void __init check_writebuffer_bugs(void)
         const char *reason;
         unsigned long v = 1;
 
-        printk(KERN_INFO "CPU: Testing write buffer coherency: ");
+        pr_info("CPU: Testing write buffer coherency: ");
 
         page = alloc_page(GFP_KERNEL);
         if (page) {
@@ -261,9 +261,9 @@ void __init check_writebuffer_bugs(void)
         }
 
         if (v) {
-                printk("failed, %s\n", reason);
+                pr_cont("failed, %s\n", reason);
                 shared_pte_mask = L_PTE_MT_UNCACHED;
         } else {
-                printk("ok\n");
+                pr_cont("ok\n");
         }
 }