diff options
author | Joe Perches <joe@perches.com> | 2009-07-06 16:05:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 13:30:03 -0400 |
commit | ad361c9884e809340f6daca80d56a9e9c871690a (patch) | |
tree | 7ec02c9934964fecdc791a0df0fc722d3bda5c53 /drivers/ssb | |
parent | e3288775ff63900fbb7db505f2b9a1bee98f07df (diff) |
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>
Diffstat (limited to 'drivers/ssb')
-rw-r--r-- | drivers/ssb/pcmcia.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c index fbfadbac67e8..131030f693c7 100644 --- a/drivers/ssb/pcmcia.c +++ b/drivers/ssb/pcmcia.c | |||
@@ -583,7 +583,7 @@ static int ssb_pcmcia_sprom_write_all(struct ssb_bus *bus, const u16 *sprom) | |||
583 | ssb_printk("."); | 583 | ssb_printk("."); |
584 | err = ssb_pcmcia_sprom_write(bus, i, sprom[i]); | 584 | err = ssb_pcmcia_sprom_write(bus, i, sprom[i]); |
585 | if (err) { | 585 | if (err) { |
586 | ssb_printk("\n" KERN_NOTICE PFX | 586 | ssb_printk(KERN_NOTICE PFX |
587 | "Failed to write to SPROM.\n"); | 587 | "Failed to write to SPROM.\n"); |
588 | failed = 1; | 588 | failed = 1; |
589 | break; | 589 | break; |
@@ -591,7 +591,7 @@ static int ssb_pcmcia_sprom_write_all(struct ssb_bus *bus, const u16 *sprom) | |||
591 | } | 591 | } |
592 | err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEDIS); | 592 | err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEDIS); |
593 | if (err) { | 593 | if (err) { |
594 | ssb_printk("\n" KERN_NOTICE PFX | 594 | ssb_printk(KERN_NOTICE PFX |
595 | "Could not disable SPROM write access.\n"); | 595 | "Could not disable SPROM write access.\n"); |
596 | failed = 1; | 596 | failed = 1; |
597 | } | 597 | } |