Skip to content

Commit fe3881c

Browse files
JoePerchesdavem330
JoePerches
authored and
davem330
committed
drivers/net: Convert remaining uses of pr_warning to pr_warn
Use the much more common pr_warn instead of pr_warning. Other miscellanea: o Typo fixes submiting/submitting o Coalesce formats o Realign arguments o Add missing terminating '\n' to formats Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 46cfd72 commit fe3881c

File tree

17 files changed

+62
-68
lines changed

17 files changed

+62
-68
lines changed

‎drivers/net/ethernet/3com/3c509.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -695,9 +695,9 @@ el3_tx_timeout (struct net_device *dev)
695695
int ioaddr = dev->base_addr;
696696

697697
/* Transmitter timeout, serious problems. */
698-
pr_warning("%s: transmit timed out, Tx_status %2.2x status %4.4x Tx FIFO room %d.\n",
699-
dev->name, inb(ioaddr + TX_STATUS), inw(ioaddr + EL3_STATUS),
700-
inw(ioaddr + TX_FREE));
698+
pr_warn("%s: transmit timed out, Tx_status %2.2x status %4.4x Tx FIFO room %d\n",
699+
dev->name, inb(ioaddr + TX_STATUS), inw(ioaddr + EL3_STATUS),
700+
inw(ioaddr + TX_FREE));
701701
dev->stats.tx_errors++;
702702
dev->trans_start = jiffies; /* prevent tx timeout */
703703
/* Issue TX_RESET and TX_START commands. */

‎drivers/net/ethernet/3com/3c515.c

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ static struct net_device *corkscrew_scan(int unit)
515515
if (pnp_device_attach(idev) < 0)
516516
continue;
517517
if (pnp_activate_dev(idev) < 0) {
518-
pr_warning("pnp activate failed (out of resources?)\n");
518+
pr_warn("pnp activate failed (out of resources?)\n");
519519
pnp_device_detach(idev);
520520
continue;
521521
}
@@ -659,7 +659,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
659659
pr_cont(", IRQ %d\n", dev->irq);
660660
/* Tell them about an invalid IRQ. */
661661
if (corkscrew_debug && (dev->irq <= 0 || dev->irq > 15))
662-
pr_warning(" *** Warning: this IRQ is unlikely to work! ***\n");
662+
pr_warn(" *** Warning: this IRQ is unlikely to work! ***\n");
663663

664664
{
665665
static const char * const ram_split[] = {
@@ -967,13 +967,13 @@ static void corkscrew_timeout(struct net_device *dev)
967967
struct corkscrew_private *vp = netdev_priv(dev);
968968
int ioaddr = dev->base_addr;
969969

970-
pr_warning("%s: transmit timed out, tx_status %2.2x status %4.4x.\n",
971-
dev->name, inb(ioaddr + TxStatus),
972-
inw(ioaddr + EL3_STATUS));
970+
pr_warn("%s: transmit timed out, tx_status %2.2x status %4.4x\n",
971+
dev->name, inb(ioaddr + TxStatus),
972+
inw(ioaddr + EL3_STATUS));
973973
/* Slight code bloat to be user friendly. */
974974
if ((inb(ioaddr + TxStatus) & 0x88) == 0x88)
975-
pr_warning("%s: Transmitter encountered 16 collisions --"
976-
" network cable problem?\n", dev->name);
975+
pr_warn("%s: Transmitter encountered 16 collisions -- network cable problem?\n",
976+
dev->name);
977977
#ifndef final_version
978978
pr_debug(" Flags; bus-master %d, full %d; dirty %d current %d.\n",
979979
vp->full_bus_master_tx, vp->tx_full, vp->dirty_tx,
@@ -1382,13 +1382,10 @@ static int boomerang_rx(struct net_device *dev)
13821382
temp = skb_put(skb, pkt_len);
13831383
/* Remove this checking code for final release. */
13841384
if (isa_bus_to_virt(vp->rx_ring[entry].addr) != temp)
1385-
pr_warning("%s: Warning -- the skbuff addresses do not match"
1386-
" in boomerang_rx: %p vs. %p / %p.\n",
1387-
dev->name,
1388-
isa_bus_to_virt(vp->
1389-
rx_ring[entry].
1390-
addr), skb->head,
1391-
temp);
1385+
pr_warn("%s: Warning -- the skbuff addresses do not match in boomerang_rx: %p vs. %p / %p\n",
1386+
dev->name,
1387+
isa_bus_to_virt(vp->rx_ring[entry].addr),
1388+
skb->head, temp);
13921389
rx_nocopy++;
13931390
}
13941391
skb->protocol = eth_type_trans(skb, dev);

‎drivers/net/ethernet/3com/3c59x.c

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,8 +1310,8 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,
13101310
pr_cont(", IRQ %d\n", dev->irq);
13111311
/* Tell them about an invalid IRQ. */
13121312
if (dev->irq <= 0 || dev->irq >= nr_irqs)
1313-
pr_warning(" *** Warning: IRQ %d is unlikely to work! ***\n",
1314-
dev->irq);
1313+
pr_warn(" *** Warning: IRQ %d is unlikely to work! ***\n",
1314+
dev->irq);
13151315

13161316
step = (window_read8(vp, 4, Wn4_NetDiag) & 0x1e) >> 1;
13171317
if (print_info) {
@@ -1425,7 +1425,7 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,
14251425
}
14261426
mii_preamble_required--;
14271427
if (phy_idx == 0) {
1428-
pr_warning(" ***WARNING*** No MII transceivers found!\n");
1428+
pr_warn(" ***WARNING*** No MII transceivers found!\n");
14291429
vp->phys[0] = 24;
14301430
} else {
14311431
vp->advertising = mdio_read(dev, vp->phys[0], MII_ADVERTISE);
@@ -1566,8 +1566,7 @@ vortex_up(struct net_device *dev)
15661566
pci_restore_state(VORTEX_PCI(vp));
15671567
err = pci_enable_device(VORTEX_PCI(vp));
15681568
if (err) {
1569-
pr_warning("%s: Could not enable device\n",
1570-
dev->name);
1569+
pr_warn("%s: Could not enable device\n", dev->name);
15711570
goto err_out;
15721571
}
15731572
}
@@ -2007,8 +2006,8 @@ vortex_error(struct net_device *dev, int status)
20072006
/* This occurs when we have the wrong media type! */
20082007
if (DoneDidThat == 0 &&
20092008
ioread16(ioaddr + EL3_STATUS) & StatsFull) {
2010-
pr_warning("%s: Updating statistics failed, disabling "
2011-
"stats as an interrupt source.\n", dev->name);
2009+
pr_warn("%s: Updating statistics failed, disabling stats as an interrupt source\n",
2010+
dev->name);
20122011
iowrite16(SetIntrEnb |
20132012
(window_read16(vp, 5, 10) & ~StatsFull),
20142013
ioaddr + EL3_CMD);
@@ -2147,8 +2146,8 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
21472146

21482147
if (vp->cur_tx - vp->dirty_tx >= TX_RING_SIZE) {
21492148
if (vortex_debug > 0)
2150-
pr_warning("%s: BUG! Tx Ring full, refusing to send buffer.\n",
2151-
dev->name);
2149+
pr_warn("%s: BUG! Tx Ring full, refusing to send buffer\n",
2150+
dev->name);
21522151
netif_stop_queue(dev);
21532152
return NETDEV_TX_BUSY;
21542153
}
@@ -2311,7 +2310,7 @@ vortex_interrupt(int irq, void *dev_id)
23112310
}
23122311

23132312
if (--work_done < 0) {
2314-
pr_warning("%s: Too much work in interrupt, status %4.4x.\n",
2313+
pr_warn("%s: Too much work in interrupt, status %4.4x\n",
23152314
dev->name, status);
23162315
/* Disable all pending interrupts. */
23172316
do {
@@ -2444,7 +2443,7 @@ boomerang_interrupt(int irq, void *dev_id)
24442443
vortex_error(dev, status);
24452444

24462445
if (--work_done < 0) {
2447-
pr_warning("%s: Too much work in interrupt, status %4.4x.\n",
2446+
pr_warn("%s: Too much work in interrupt, status %4.4x\n",
24482447
dev->name, status);
24492448
/* Disable all pending interrupts. */
24502449
do {
@@ -2620,7 +2619,8 @@ boomerang_rx(struct net_device *dev)
26202619
if (skb == NULL) {
26212620
static unsigned long last_jif;
26222621
if (time_after(jiffies, last_jif + 10 * HZ)) {
2623-
pr_warning("%s: memory shortage\n", dev->name);
2622+
pr_warn("%s: memory shortage\n",
2623+
dev->name);
26242624
last_jif = jiffies;
26252625
}
26262626
if ((vp->cur_rx - vp->dirty_rx) == RX_RING_SIZE)
@@ -2719,7 +2719,8 @@ vortex_close(struct net_device *dev)
27192719
if (vp->rx_csumhits &&
27202720
(vp->drv_flags & HAS_HWCKSM) == 0 &&
27212721
(vp->card_idx >= MAX_UNITS || hw_checksums[vp->card_idx] == -1)) {
2722-
pr_warning("%s supports hardware checksums, and we're not using them!\n", dev->name);
2722+
pr_warn("%s supports hardware checksums, and we're not using them!\n",
2723+
dev->name);
27232724
}
27242725
#endif
27252726

‎drivers/net/ethernet/broadcom/b44.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ static void b44_wap54g10_workaround(struct b44 *bp)
427427
}
428428
return;
429429
error:
430-
pr_warning("PHY: cannot reset MII transceiver isolate bit\n");
430+
pr_warn("PHY: cannot reset MII transceiver isolate bit\n");
431431
}
432432
#else
433433
static inline void b44_wap54g10_workaround(struct b44 *bp)

‎drivers/net/ethernet/cisco/enic/vnic_dev.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,7 @@ int vnic_dev_intr_coal_timer_info(struct vnic_dev *vdev)
847847
*/
848848
if ((err == ERR_ECMDUNKNOWN) ||
849849
(!err && !(vdev->args[0] && vdev->args[1] && vdev->args[2]))) {
850-
pr_warning("Using default conversion factor for "
851-
"interrupt coalesce timer\n");
850+
pr_warn("Using default conversion factor for interrupt coalesce timer\n");
852851
vnic_dev_intr_coal_timer_info_default(vdev);
853852
return 0;
854853
}

‎drivers/net/ethernet/marvell/skge.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@ static u16 xm_phy_read(struct skge_hw *hw, int port, u16 reg)
11071107
{
11081108
u16 v = 0;
11091109
if (__xm_phy_read(hw, port, reg, &v))
1110-
pr_warning("%s: phy read timed out\n", hw->dev[port]->name);
1110+
pr_warn("%s: phy read timed out\n", hw->dev[port]->name);
11111111
return v;
11121112
}
11131113

@@ -1903,7 +1903,7 @@ static int gm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val)
19031903
return 0;
19041904
}
19051905

1906-
pr_warning("%s: phy write timeout\n", hw->dev[port]->name);
1906+
pr_warn("%s: phy write timeout\n", hw->dev[port]->name);
19071907
return -EIO;
19081908
}
19091909

@@ -1931,7 +1931,7 @@ static u16 gm_phy_read(struct skge_hw *hw, int port, u16 reg)
19311931
{
19321932
u16 v = 0;
19331933
if (__gm_phy_read(hw, port, reg, &v))
1934-
pr_warning("%s: phy read timeout\n", hw->dev[port]->name);
1934+
pr_warn("%s: phy read timeout\n", hw->dev[port]->name);
19351935
return v;
19361936
}
19371937

‎drivers/net/ethernet/marvell/sky2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2814,7 +2814,7 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do, u16 idx)
28142814

28152815
default:
28162816
if (net_ratelimit())
2817-
pr_warning("unknown status opcode 0x%x\n", opcode);
2817+
pr_warn("unknown status opcode 0x%x\n", opcode);
28182818
}
28192819
} while (hw->st_idx != idx);
28202820

‎drivers/net/ethernet/packetengines/yellowfin.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -693,11 +693,11 @@ static void yellowfin_tx_timeout(struct net_device *dev)
693693
/* Note: these should be KERN_DEBUG. */
694694
if (yellowfin_debug) {
695695
int i;
696-
pr_warning(" Rx ring %p: ", yp->rx_ring);
696+
pr_warn(" Rx ring %p: ", yp->rx_ring);
697697
for (i = 0; i < RX_RING_SIZE; i++)
698698
pr_cont(" %08x", yp->rx_ring[i].result_status);
699699
pr_cont("\n");
700-
pr_warning(" Tx ring %p: ", yp->tx_ring);
700+
pr_warn(" Tx ring %p: ", yp->tx_ring);
701701
for (i = 0; i < TX_RING_SIZE; i++)
702702
pr_cont(" %04x /%08x",
703703
yp->tx_status[i].tx_errs,

‎drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,9 +1477,8 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
14771477
u32 val;
14781478

14791479
if (pdev->revision >= NX_P3_A0 && pdev->revision <= NX_P3_B1) {
1480-
pr_warning("%s: chip revisions between 0x%x-0x%x "
1481-
"will not be enabled.\n",
1482-
module_name(THIS_MODULE), NX_P3_A0, NX_P3_B1);
1480+
pr_warn("%s: chip revisions between 0x%x-0x%x will not be enabled\n",
1481+
module_name(THIS_MODULE), NX_P3_A0, NX_P3_B1);
14831482
return -ENODEV;
14841483
}
14851484

‎drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ int stmmac_mdio_register(struct net_device *ndev)
282282
}
283283

284284
if (!found) {
285-
pr_warning("%s: No PHY found\n", ndev->name);
285+
pr_warn("%s: No PHY found\n", ndev->name);
286286
mdiobus_unregister(new_bus);
287287
mdiobus_free(new_bus);
288288
return -ENODEV;

‎drivers/net/ethernet/sun/cassini.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4962,7 +4962,7 @@ static int cas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
49624962
pci_cmd |= PCI_COMMAND_PARITY;
49634963
pci_write_config_word(pdev, PCI_COMMAND, pci_cmd);
49644964
if (pci_try_set_mwi(pdev))
4965-
pr_warning("Could not enable MWI for %s\n", pci_name(pdev));
4965+
pr_warn("Could not enable MWI for %s\n", pci_name(pdev));
49664966

49674967
cas_program_bridge(pdev);
49684968

‎drivers/net/ethernet/sun/niu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8717,8 +8717,8 @@ static void niu_divide_channels(struct niu_parent *parent,
87178717
parent->txchan_per_port[i] = 1;
87188718
}
87198719
if (tot_rx < NIU_NUM_RXCHAN || tot_tx < NIU_NUM_TXCHAN) {
8720-
pr_warning("niu%d: Driver bug, wasted channels, RX[%d] TX[%d]\n",
8721-
parent->index, tot_rx, tot_tx);
8720+
pr_warn("niu%d: Driver bug, wasted channels, RX[%d] TX[%d]\n",
8721+
parent->index, tot_rx, tot_tx);
87228722
}
87238723
}
87248724

‎drivers/net/ethernet/sun/sunvnet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ static void vnet_event(void *arg, int event)
534534
}
535535

536536
if (unlikely(event != LDC_EVENT_DATA_READY)) {
537-
pr_warning("Unexpected LDC event %d\n", event);
537+
pr_warn("Unexpected LDC event %d\n", event);
538538
spin_unlock_irqrestore(&vio->lock, flags);
539539
return;
540540
}

‎drivers/net/ethernet/tile/tilepro.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@ static int tile_net_open_aux(struct net_device *dev)
956956
*/
957957
if (hv_dev_pwrite(priv->hv_devhdl, 0, (HV_VirtAddr)&dummy,
958958
sizeof(dummy), NETIO_IPP_START_SHIM_OFF) < 0) {
959-
pr_warning("Failed to start LIPP/LEPP.\n");
959+
pr_warn("Failed to start LIPP/LEPP\n");
960960
return -EIO;
961961
}
962962

@@ -2399,8 +2399,7 @@ static int __init network_cpus_setup(char *str)
23992399
{
24002400
int rc = cpulist_parse_crop(str, &network_cpus_map);
24012401
if (rc != 0) {
2402-
pr_warning("network_cpus=%s: malformed cpu list\n",
2403-
str);
2402+
pr_warn("network_cpus=%s: malformed cpu list\n", str);
24042403
} else {
24052404

24062405
/* Remove dedicated cpus. */
@@ -2409,8 +2408,7 @@ static int __init network_cpus_setup(char *str)
24092408

24102409

24112410
if (cpumask_empty(&network_cpus_map)) {
2412-
pr_warning("Ignoring network_cpus='%s'.\n",
2413-
str);
2411+
pr_warn("Ignoring network_cpus='%s'\n", str);
24142412
} else {
24152413
char buf[1024];
24162414
cpulist_scnprintf(buf, sizeof(buf), &network_cpus_map);

‎drivers/net/wireless/mwifiex/usb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ static int mwifiex_usb_probe(struct usb_interface *intf,
357357
card->usb_boot_state = USB8XXX_FW_READY;
358358
break;
359359
default:
360-
pr_warning("unknown id_product %#x\n", id_product);
360+
pr_warn("unknown id_product %#x\n", id_product);
361361
card->usb_boot_state = USB8XXX_FW_DNLD;
362362
break;
363363
}

‎drivers/net/wireless/orinoco/orinoco_usb.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ static void ezusb_request_out_callback(struct urb *urb)
534534

535535
if (ctx->killed) {
536536
spin_unlock_irqrestore(&upriv->req_lock, flags);
537-
pr_warning("interrupt called with dead ctx");
537+
pr_warn("interrupt called with dead ctx\n");
538538
goto out;
539539
}
540540

@@ -671,8 +671,8 @@ static void ezusb_request_in_callback(struct ezusb_priv *upriv,
671671
default:
672672
spin_unlock_irqrestore(&upriv->req_lock, flags);
673673

674-
pr_warning("Matched IN URB, unexpected context state(0x%x)",
675-
state);
674+
pr_warn("Matched IN URB, unexpected context state(0x%x)\n",
675+
state);
676676
/* Throw this CTX away and try submitting another */
677677
del_timer(&ctx->timer);
678678
ctx->outurb->transfer_flags |= URB_ASYNC_UNLINK;
@@ -1394,12 +1394,12 @@ static void ezusb_bulk_in_callback(struct urb *urb)
13941394
/* When a device gets unplugged we get this every time
13951395
* we resubmit, flooding the logs. Since we don't use
13961396
* USB timeouts, it shouldn't happen any other time*/
1397-
pr_warning("%s: urb timed out, not resubmiting", __func__);
1397+
pr_warn("%s: urb timed out, not resubmitting\n", __func__);
13981398
return;
13991399
}
14001400
if (urb->status == -ECONNABORTED) {
1401-
pr_warning("%s: connection abort, resubmiting urb",
1402-
__func__);
1401+
pr_warn("%s: connection abort, resubmitting urb\n",
1402+
__func__);
14031403
goto resubmit;
14041404
}
14051405
if ((urb->status == -EILSEQ)
@@ -1608,7 +1608,7 @@ static int ezusb_probe(struct usb_interface *interface,
16081608
if (usb_endpoint_is_bulk_in(ep)) {
16091609
/* we found a bulk in endpoint */
16101610
if (upriv->read_urb != NULL) {
1611-
pr_warning("Found a second bulk in ep, ignored");
1611+
pr_warn("Found a second bulk in ep, ignored\n");
16121612
continue;
16131613
}
16141614

@@ -1618,10 +1618,10 @@ static int ezusb_probe(struct usb_interface *interface,
16181618
goto error;
16191619
}
16201620
if (le16_to_cpu(ep->wMaxPacketSize) != 64)
1621-
pr_warning("bulk in: wMaxPacketSize!= 64");
1621+
pr_warn("bulk in: wMaxPacketSize!= 64\n");
16221622
if (ep->bEndpointAddress != (2 | USB_DIR_IN))
1623-
pr_warning("bulk in: bEndpointAddress: %d",
1624-
ep->bEndpointAddress);
1623+
pr_warn("bulk in: bEndpointAddress: %d\n",
1624+
ep->bEndpointAddress);
16251625
upriv->read_pipe = usb_rcvbulkpipe(udev,
16261626
ep->
16271627
bEndpointAddress);
@@ -1636,15 +1636,15 @@ static int ezusb_probe(struct usb_interface *interface,
16361636
if (usb_endpoint_is_bulk_out(ep)) {
16371637
/* we found a bulk out endpoint */
16381638
if (upriv->bap_buf != NULL) {
1639-
pr_warning("Found a second bulk out ep, ignored");
1639+
pr_warn("Found a second bulk out ep, ignored\n");
16401640
continue;
16411641
}
16421642

16431643
if (le16_to_cpu(ep->wMaxPacketSize) != 64)
1644-
pr_warning("bulk out: wMaxPacketSize != 64");
1644+
pr_warn("bulk out: wMaxPacketSize != 64\n");
16451645
if (ep->bEndpointAddress != 2)
1646-
pr_warning("bulk out: bEndpointAddress: %d",
1647-
ep->bEndpointAddress);
1646+
pr_warn("bulk out: bEndpointAddress: %d\n",
1647+
ep->bEndpointAddress);
16481648
upriv->write_pipe = usb_sndbulkpipe(udev,
16491649
ep->
16501650
bEndpointAddress);

0 commit comments

Comments
 (0)