Remove multiple KERN_ prefixes from printk formats

Commit 5fd29d6ccbc98884569d6f3105aeca70858b3e0f ("printk: clean up
handling of log-levels and newlines") changed printk semantics.  printk
lines with multiple KERN_<level> prefixes are no longer emitted as
before the patch.

<level> is now included in the output on each additional use.

Remove all uses of multiple KERN_<level>s in formats.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

4 files changed, 11 insertions, 11 deletions

diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index fb8163d181ab..a21efcd10b78 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -226,9 +226,10 @@ static int clcdfb_set_par(struct fb_info *info)
         clcdfb_enable(fb, regs.cntl);
 
 #ifdef DEBUG
-        printk(KERN_INFO "CLCD: Registers set to\n"
-               KERN_INFO "  %08x %08x %08x %08x\n"
-               KERN_INFO "  %08x %08x %08x %08x\n",
+        printk(KERN_INFO
+               "CLCD: Registers set to\n"
+               "  %08x %08x %08x %08x\n"
+               "  %08x %08x %08x %08x\n",
                 readl(fb->regs + CLCD_TIM0), readl(fb->regs + CLCD_TIM1),
                 readl(fb->regs + CLCD_TIM2), readl(fb->regs + CLCD_TIM3),
                 readl(fb->regs + CLCD_UBAS), readl(fb->regs + CLCD_LBAS),
diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c
index 0ce3b0a89798..a74e5da17aa0 100644
--- a/drivers/video/matrox/matroxfb_DAC1064.c
+++ b/drivers/video/matrox/matroxfb_DAC1064.c
@@ -454,9 +454,9 @@ static void DAC1064_restore_2(WPMINFO2) {
         dprintk(KERN_DEBUG "DAC1064regs ");
         for (i = 0; i < sizeof(MGA1064_DAC_regs); i++) {
                 dprintk("R%02X=%02X ", MGA1064_DAC_regs[i], ACCESS_FBINFO(hw).DACreg[i]);
-                if ((i & 0x7) == 0x7) dprintk("\n" KERN_DEBUG "continuing... ");
+                if ((i & 0x7) == 0x7) dprintk(KERN_DEBUG "continuing... ");
         }
-        dprintk("\n" KERN_DEBUG "DAC1064clk ");
+        dprintk(KERN_DEBUG "DAC1064clk ");
         for (i = 0; i < 6; i++)
                 dprintk("C%02X=%02X ", i, ACCESS_FBINFO(hw).DACclk[i]);
         dprintk("\n");
diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c
index 13524821e242..4e825112a601 100644
--- a/drivers/video/matrox/matroxfb_Ti3026.c
+++ b/drivers/video/matrox/matroxfb_Ti3026.c
@@ -651,9 +651,9 @@ static void Ti3026_restore(WPMINFO2) {
         dprintk(KERN_DEBUG "3026DACregs ");
         for (i = 0; i < 21; i++) {
                 dprintk("R%02X=%02X ", DACseq[i], hw->DACreg[i]);
-                if ((i & 0x7) == 0x7) dprintk("\n" KERN_DEBUG "continuing... ");
+                if ((i & 0x7) == 0x7) dprintk(KERN_DEBUG "continuing... ");
         }
-        dprintk("\n" KERN_DEBUG "DACclk ");
+        dprintk(KERN_DEBUG "DACclk ");
         for (i = 0; i < 6; i++)
                 dprintk("C%02X=%02X ", i, hw->DACclk[i]);
         dprintk("\n");
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c
index eec9dcb7f599..6120f0c526fe 100644
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
@@ -1115,10 +1115,9 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
                   if the device name contains the string "DX" and tell the
                   user how to reconfigure the card. */
                 if (strstr(sti->outptr.dev_name, "DX")) {
-                   printk(KERN_WARNING "WARNING: stifb framebuffer driver does not "
-                        "support '%s' in double-buffer mode.\n"
-                        KERN_WARNING "WARNING: Please disable the double-buffer mode "
-                        "in IPL menu (the PARISC-BIOS).\n",
+                   printk(KERN_WARNING
+"WARNING: stifb framebuffer driver does not support '%s' in double-buffer mode.\n"
+"WARNING: Please disable the double-buffer mode in IPL menu (the PARISC-BIOS).\n",
                         sti->outptr.dev_name);
                    goto out_err0;
                 }