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>

2 files changed, 13 insertions, 12 deletions

diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
index 5dcbe603eca2..91b53eb1c053 100644
--- a/drivers/char/hw_random/intel-rng.c
+++ b/drivers/char/hw_random/intel-rng.c
@@ -305,10 +305,11 @@ static int __init intel_init_hw_struct(struct intel_rng_hw *intel_rng_hw,
              (BIOS_CNTL_LOCK_ENABLE_MASK|BIOS_CNTL_WRITE_ENABLE_MASK))
             == BIOS_CNTL_LOCK_ENABLE_MASK) {
                 static __initdata /*const*/ char warning[] =
-                        KERN_WARNING PFX "Firmware space is locked read-only. If you can't or\n"
-                        KERN_WARNING PFX "don't want to disable this in firmware setup, and if\n"
-                        KERN_WARNING PFX "you are certain that your system has a functional\n"
-                        KERN_WARNING PFX "RNG, try using the 'no_fwh_detect' option.\n";
+                        KERN_WARNING
+PFX "Firmware space is locked read-only. If you can't or\n"
+PFX "don't want to disable this in firmware setup, and if\n"
+PFX "you are certain that your system has a functional\n"
+PFX "RNG, try using the 'no_fwh_detect' option.\n";
 
                 if (no_fwh_detect)
                         return -ENODEV;
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 4159292e35cf..621d1184673c 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -1478,10 +1478,10 @@ static int __devinit load_firmware(struct pci_dev *pdev,
                 status = inw(base + 0x4);
                 if (status != 0) {
                         dev_warn(&pdev->dev, "Card%d rejected load header:\n"
-                                KERN_WARNING "Address:0x%x\n"
-                                KERN_WARNING "Count:0x%x\n"
-                                KERN_WARNING "Status:0x%x\n",
-                                index + 1, frame->addr, frame->count, status);
+                                 "Address:0x%x\n"
+                                 "Count:0x%x\n"
+                                 "Status:0x%x\n",
+                                 index + 1, frame->addr, frame->count, status);
                         goto errrelfw;
                 }
                 outsw(base, frame->data, word_count);
@@ -1526,10 +1526,10 @@ static int __devinit load_firmware(struct pci_dev *pdev,
                 status = inw(base + 0x4);
                 if (status != 0) {
                         dev_warn(&pdev->dev, "Card%d rejected verify header:\n"
-                                KERN_WARNING "Address:0x%x\n"
-                                KERN_WARNING "Count:0x%x\n"
-                                KERN_WARNING "Status: 0x%x\n",
-                                index + 1, frame->addr, frame->count, status);
+                                 "Address:0x%x\n"
+                                 "Count:0x%x\n"
+                                 "Status: 0x%x\n",
+                                 index + 1, frame->addr, frame->count, status);
                         goto errrelfw;
                 }