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>
此提交包含在:
@@ -584,8 +584,9 @@ static void sca_dump_rings(struct net_device *dev)
|
||||
sca_in(DSR_RX(phy_node(port)), card) & DSR_DE ? "" : "in");
|
||||
for (cnt = 0; cnt < port_to_card(port)->rx_ring_buffers; cnt++)
|
||||
printk(" %02X", readb(&(desc_address(port, cnt, 0)->stat)));
|
||||
printk(KERN_CONT "\n");
|
||||
|
||||
printk("\n" KERN_DEBUG "TX ring: CDA=%u EDA=%u DSR=%02X in=%u "
|
||||
printk(KERN_DEBUG "TX ring: CDA=%u EDA=%u DSR=%02X in=%u "
|
||||
"last=%u %sactive",
|
||||
sca_inw(get_dmac_tx(port) + CDAL, card),
|
||||
sca_inw(get_dmac_tx(port) + EDAL, card),
|
||||
|
@@ -529,8 +529,9 @@ static void sca_dump_rings(struct net_device *dev)
|
||||
sca_in(DSR_RX(port->chan), card) & DSR_DE ? "" : "in");
|
||||
for (cnt = 0; cnt < port->card->rx_ring_buffers; cnt++)
|
||||
printk(" %02X", readb(&(desc_address(port, cnt, 0)->stat)));
|
||||
printk(KERN_CONT "\n");
|
||||
|
||||
printk("\n" KERN_DEBUG "TX ring: CDA=%u EDA=%u DSR=%02X in=%u "
|
||||
printk(KERN_DEBUG "TX ring: CDA=%u EDA=%u DSR=%02X in=%u "
|
||||
"last=%u %sactive",
|
||||
sca_inl(get_dmac_tx(port) + CDAL, card),
|
||||
sca_inl(get_dmac_tx(port) + EDAL, card),
|
||||
|
@@ -326,11 +326,9 @@ sbni_pci_probe( struct net_device *dev )
|
||||
}
|
||||
|
||||
if (pci_irq_line <= 0 || pci_irq_line >= nr_irqs)
|
||||
printk( KERN_WARNING " WARNING: The PCI BIOS assigned "
|
||||
"this PCI card to IRQ %d, which is unlikely "
|
||||
"to work!.\n"
|
||||
KERN_WARNING " You should use the PCI BIOS "
|
||||
"setup to assign a valid IRQ line.\n",
|
||||
printk( KERN_WARNING
|
||||
" WARNING: The PCI BIOS assigned this PCI card to IRQ %d, which is unlikely to work!.\n"
|
||||
" You should use the PCI BIOS setup to assign a valid IRQ line.\n",
|
||||
pci_irq_line );
|
||||
|
||||
/* avoiding re-enable dual adapters */
|
||||
|
新增問題並參考
封鎖使用者