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/char/isicom.c | |
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/char/isicom.c')
-rw-r--r-- | drivers/char/isicom.c | 16 |
1 files changed, 8 insertions, 8 deletions
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, | |||
1478 | status = inw(base + 0x4); | 1478 | status = inw(base + 0x4); |
1479 | if (status != 0) { | 1479 | if (status != 0) { |
1480 | dev_warn(&pdev->dev, "Card%d rejected load header:\n" | 1480 | dev_warn(&pdev->dev, "Card%d rejected load header:\n" |
1481 | KERN_WARNING "Address:0x%x\n" | 1481 | "Address:0x%x\n" |
1482 | KERN_WARNING "Count:0x%x\n" | 1482 | "Count:0x%x\n" |
1483 | KERN_WARNING "Status:0x%x\n", | 1483 | "Status:0x%x\n", |
1484 | index + 1, frame->addr, frame->count, status); | 1484 | index + 1, frame->addr, frame->count, status); |
1485 | goto errrelfw; | 1485 | goto errrelfw; |
1486 | } | 1486 | } |
1487 | outsw(base, frame->data, word_count); | 1487 | outsw(base, frame->data, word_count); |
@@ -1526,10 +1526,10 @@ static int __devinit load_firmware(struct pci_dev *pdev, | |||
1526 | status = inw(base + 0x4); | 1526 | status = inw(base + 0x4); |
1527 | if (status != 0) { | 1527 | if (status != 0) { |
1528 | dev_warn(&pdev->dev, "Card%d rejected verify header:\n" | 1528 | dev_warn(&pdev->dev, "Card%d rejected verify header:\n" |
1529 | KERN_WARNING "Address:0x%x\n" | 1529 | "Address:0x%x\n" |
1530 | KERN_WARNING "Count:0x%x\n" | 1530 | "Count:0x%x\n" |
1531 | KERN_WARNING "Status: 0x%x\n", | 1531 | "Status: 0x%x\n", |
1532 | index + 1, frame->addr, frame->count, status); | 1532 | index + 1, frame->addr, frame->count, status); |
1533 | goto errrelfw; | 1533 | goto errrelfw; |
1534 | } | 1534 | } |
1535 | 1535 | ||