Remove multiple KERN_ prefixes from printk formats
Commit 5fd29d6ccb
("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>
This commit is contained in:
committed by
Linus Torvalds
parent
e3288775ff
commit
ad361c9884
@@ -1132,7 +1132,9 @@ static int tsi108_get_mac(struct net_device *dev)
|
||||
}
|
||||
|
||||
if (!is_valid_ether_addr(dev->dev_addr)) {
|
||||
printk("KERN_ERR: word1: %08x, word2: %08x\n", word1, word2);
|
||||
printk(KERN_ERR
|
||||
"%s: Invalid MAC address. word1: %08x, word2: %08x\n",
|
||||
dev->name, word1, word2);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -1201,8 +1203,8 @@ static void tsi108_set_rx_mode(struct net_device *dev)
|
||||
__set_bit(hash, &data->mc_hash[0]);
|
||||
} else {
|
||||
printk(KERN_ERR
|
||||
"%s: got multicast address of length %d "
|
||||
"instead of 6.\n", dev->name,
|
||||
"%s: got multicast address of length %d instead of 6.\n",
|
||||
dev->name,
|
||||
mc->dmi_addrlen);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user