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>

1 files changed, 17 insertions, 17 deletions

diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 8eeb457ce5d5..8a1caf2bb5b9 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -212,7 +212,7 @@ asmlinkage void double_fault_c(struct pt_regs *fp)
         console_verbose();
         oops_in_progress = 1;
 #ifdef CONFIG_DEBUG_VERBOSE
-        printk(KERN_EMERG "\n" KERN_EMERG "Double Fault\n");
+        printk(KERN_EMERG "Double Fault\n");
 #ifdef CONFIG_DEBUG_DOUBLEFAULT_PRINT
         if (((long)fp->seqstat &  SEQSTAT_EXCAUSE) == VEC_UNCOV) {
                 unsigned int cpu = smp_processor_id();
@@ -583,15 +583,14 @@ asmlinkage void trap_c(struct pt_regs *fp)
 #ifndef CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE
                 if (trapnr == VEC_CPLB_I_M || trapnr == VEC_CPLB_M)
                         verbose_printk(KERN_NOTICE "No trace since you do not have "
-                                "CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE enabled\n"
-                                KERN_NOTICE "\n");
+                               "CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE enabled\n\n");
                 else
 #endif
                         dump_bfin_trace_buffer();
 
                 if (oops_in_progress) {
                         /* Dump the current kernel stack */
-                        verbose_printk(KERN_NOTICE "\n" KERN_NOTICE "Kernel Stack\n");
+                        verbose_printk(KERN_NOTICE "Kernel Stack\n");
                         show_stack(current, NULL);
                         print_modules();
 #ifndef CONFIG_ACCESS_CHECK
@@ -906,7 +905,7 @@ void show_stack(struct task_struct *task, unsigned long *stack)
 
                         ret_addr = 0;
                         if (!j && i % 8 == 0)
-                                printk("\n" KERN_NOTICE "%p:",addr);
+                                printk(KERN_NOTICE "%p:",addr);
 
                         /* if it is an odd address, or zero, just skip it */
                         if (*addr & 0x1 || !*addr)
@@ -996,9 +995,9 @@ void dump_bfin_process(struct pt_regs *fp)
 
                 printk(KERN_NOTICE "CPU = %d\n", current_thread_info()->cpu);
                 if (!((unsigned long)current->mm & 0x3) && (unsigned long)current->mm >= FIXED_CODE_START)
-                        verbose_printk(KERN_NOTICE  "TEXT = 0x%p-0x%p        DATA = 0x%p-0x%p\n"
-                                KERN_NOTICE " BSS = 0x%p-0x%p  USER-STACK = 0x%p\n"
-                                KERN_NOTICE "\n",
+                        verbose_printk(KERN_NOTICE
+                                "TEXT = 0x%p-0x%p        DATA = 0x%p-0x%p\n"
+                                " BSS = 0x%p-0x%p  USER-STACK = 0x%p\n\n",
                                 (void *)current->mm->start_code,
                                 (void *)current->mm->end_code,
                                 (void *)current->mm->start_data,
@@ -1009,8 +1008,8 @@ void dump_bfin_process(struct pt_regs *fp)
                 else
                         verbose_printk(KERN_NOTICE "invalid mm\n");
         } else
-                verbose_printk(KERN_NOTICE "\n" KERN_NOTICE
-                     "No Valid process in current context\n");
+                verbose_printk(KERN_NOTICE
+                               "No Valid process in current context\n");
 #endif
 }
 
@@ -1028,7 +1027,7 @@ void dump_bfin_mem(struct pt_regs *fp)
              addr < (unsigned short *)((unsigned long)erraddr & ~0xF) + 0x10;
              addr++) {
                 if (!((unsigned long)addr & 0xF))
-                        verbose_printk("\n" KERN_NOTICE "0x%p: ", addr);
+                        verbose_printk(KERN_NOTICE "0x%p: ", addr);
 
                 if (!get_instruction(&val, addr)) {
                                 val = 0;
@@ -1056,9 +1055,9 @@ void dump_bfin_mem(struct pt_regs *fp)
             oops_in_progress)){
                 verbose_printk(KERN_NOTICE "Looks like this was a deferred error - sorry\n");
 #ifndef CONFIG_DEBUG_HWERR
-                verbose_printk(KERN_NOTICE "The remaining message may be meaningless\n"
-                        KERN_NOTICE "You should enable CONFIG_DEBUG_HWERR to get a"
-                         " better idea where it came from\n");
+                verbose_printk(KERN_NOTICE
+"The remaining message may be meaningless\n"
+"You should enable CONFIG_DEBUG_HWERR to get a better idea where it came from\n");
 #else
                 /* If we are handling only one peripheral interrupt
                  * and current mm and pid are valid, and the last error
@@ -1114,9 +1113,10 @@ void show_regs(struct pt_regs *fp)
 
         verbose_printk(KERN_NOTICE "%s", linux_banner);
 
-        verbose_printk(KERN_NOTICE "\n" KERN_NOTICE "SEQUENCER STATUS:\t\t%s\n", print_tainted());
+        verbose_printk(KERN_NOTICE "\nSEQUENCER STATUS:\t\t%s\n",
+                       print_tainted());
         verbose_printk(KERN_NOTICE " SEQSTAT: %08lx  IPEND: %04lx  SYSCFG: %04lx\n",
-                (long)fp->seqstat, fp->ipend, fp->syscfg);
+                       (long)fp->seqstat, fp->ipend, fp->syscfg);
         if ((fp->seqstat & SEQSTAT_EXCAUSE) == VEC_HWERR) {
                 verbose_printk(KERN_NOTICE "  HWERRCAUSE: 0x%lx\n",
                         (fp->seqstat & SEQSTAT_HWERRCAUSE) >> 14);
@@ -1184,7 +1184,7 @@ unlock:
                 verbose_printk(KERN_NOTICE "ICPLB_FAULT_ADDR: %s\n", buf);
         }
 
-        verbose_printk(KERN_NOTICE "\n" KERN_NOTICE "PROCESSOR STATE:\n");
+        verbose_printk(KERN_NOTICE "PROCESSOR STATE:\n");
         verbose_printk(KERN_NOTICE " R0 : %08lx    R1 : %08lx    R2 : %08lx    R3 : %08lx\n",
                 fp->r0, fp->r1, fp->r2, fp->r3);
         verbose_printk(KERN_NOTICE " R4 : %08lx    R5 : %08lx    R6 : %08lx    R7 : %08lx\n",