Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe3881cf authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 46cfd725

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

+3 −3
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ el3_tx_timeout (struct net_device *dev) 
	int ioaddr = dev->base_addr;



	/* Transmitter timeout, serious problems. */

	pr_warning("%s: transmit timed out, Tx_status %2.2x status %4.4x Tx FIFO room %d.\n",

	pr_warn("%s: transmit timed out, Tx_status %2.2x status %4.4x Tx FIFO room %d\n",

		dev->name, inb(ioaddr + TX_STATUS), inw(ioaddr + EL3_STATUS),

		inw(ioaddr + TX_FREE));

	dev->stats.tx_errors++;

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

+11 −14
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static struct net_device *corkscrew_scan(int unit) 
			if (pnp_device_attach(idev) < 0)

				continue;

			if (pnp_activate_dev(idev) < 0) {

				pr_warning("pnp activate failed (out of resources?)\n");

				pr_warn("pnp activate failed (out of resources?)\n");

				pnp_device_detach(idev);

				continue;

			}
@@ -659,7 +659,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr, 
	pr_cont(", IRQ %d\n", dev->irq);

	/* Tell them about an invalid IRQ. */

	if (corkscrew_debug && (dev->irq <= 0 || dev->irq > 15))

		pr_warning(" *** Warning: this IRQ is unlikely to work! ***\n");

		pr_warn(" *** Warning: this IRQ is unlikely to work! ***\n");



	{

		static const char * const ram_split[] = {
@@ -967,13 +967,13 @@ static void corkscrew_timeout(struct net_device *dev) 
	struct corkscrew_private *vp = netdev_priv(dev);

	int ioaddr = dev->base_addr;



	pr_warning("%s: transmit timed out, tx_status %2.2x status %4.4x.\n",

	pr_warn("%s: transmit timed out, tx_status %2.2x status %4.4x\n",

		dev->name, inb(ioaddr + TxStatus),

		inw(ioaddr + EL3_STATUS));

	/* Slight code bloat to be user friendly. */

	if ((inb(ioaddr + TxStatus) & 0x88) == 0x88)

		pr_warning("%s: Transmitter encountered 16 collisions --"

		       " network cable problem?\n", dev->name);

		pr_warn("%s: Transmitter encountered 16 collisions -- network cable problem?\n",

			dev->name);

#ifndef final_version

	pr_debug("  Flags; bus-master %d, full %d; dirty %d current %d.\n",

	       vp->full_bus_master_tx, vp->tx_full, vp->dirty_tx,
@@ -1382,13 +1382,10 @@ static int boomerang_rx(struct net_device *dev) 
				temp = skb_put(skb, pkt_len);

				/* Remove this checking code for final release. */

				if (isa_bus_to_virt(vp->rx_ring[entry].addr) != temp)

					pr_warning("%s: Warning -- the skbuff addresses do not match"

					     " in boomerang_rx: %p vs. %p / %p.\n",

					pr_warn("%s: Warning -- the skbuff addresses do not match in boomerang_rx: %p vs. %p / %p\n",

						dev->name,

					     isa_bus_to_virt(vp->

							 rx_ring[entry].

							 addr), skb->head,

					     temp);

						isa_bus_to_virt(vp->rx_ring[entry].addr),

						skb->head, temp);

				rx_nocopy++;

			}

			skb->protocol = eth_type_trans(skb, dev);

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

+14 −13
Original line number Diff line number Diff line
@@ -1310,7 +1310,7 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq, 
		pr_cont(", IRQ %d\n", dev->irq);

	/* Tell them about an invalid IRQ. */

	if (dev->irq <= 0 || dev->irq >= nr_irqs)

		pr_warning(" *** Warning: IRQ %d is unlikely to work! ***\n",

		pr_warn(" *** Warning: IRQ %d is unlikely to work! ***\n",

			dev->irq);



	step = (window_read8(vp, 4, Wn4_NetDiag) & 0x1e) >> 1;
@@ -1425,7 +1425,7 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq, 
		}

		mii_preamble_required--;

		if (phy_idx == 0) {

			pr_warning("  ***WARNING*** No MII transceivers found!\n");

			pr_warn("  ***WARNING*** No MII transceivers found!\n");

			vp->phys[0] = 24;

		} else {

			vp->advertising = mdio_read(dev, vp->phys[0], MII_ADVERTISE);
@@ -1566,8 +1566,7 @@ vortex_up(struct net_device *dev) 
			pci_restore_state(VORTEX_PCI(vp));

		err = pci_enable_device(VORTEX_PCI(vp));

		if (err) {

			pr_warning("%s: Could not enable device\n",

				dev->name);

			pr_warn("%s: Could not enable device\n", dev->name);

			goto err_out;

		}

	}
@@ -2007,8 +2006,8 @@ vortex_error(struct net_device *dev, int status) 
		/* This occurs when we have the wrong media type! */

		if (DoneDidThat == 0  &&

			ioread16(ioaddr + EL3_STATUS) & StatsFull) {

			pr_warning("%s: Updating statistics failed, disabling "

				   "stats as an interrupt source.\n", dev->name);

			pr_warn("%s: Updating statistics failed, disabling stats as an interrupt source\n",

				dev->name);

			iowrite16(SetIntrEnb |

				  (window_read16(vp, 5, 10) & ~StatsFull),

				  ioaddr + EL3_CMD);
@@ -2147,7 +2146,7 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev) 


	if (vp->cur_tx - vp->dirty_tx >= TX_RING_SIZE) {

		if (vortex_debug > 0)

			pr_warning("%s: BUG! Tx Ring full, refusing to send buffer.\n",

			pr_warn("%s: BUG! Tx Ring full, refusing to send buffer\n",

				dev->name);

		netif_stop_queue(dev);

		return NETDEV_TX_BUSY;
@@ -2311,7 +2310,7 @@ vortex_interrupt(int irq, void *dev_id) 
		}



		if (--work_done < 0) {

			pr_warning("%s: Too much work in interrupt, status %4.4x.\n",

			pr_warn("%s: Too much work in interrupt, status %4.4x\n",

				dev->name, status);

			/* Disable all pending interrupts. */

			do {
@@ -2444,7 +2443,7 @@ boomerang_interrupt(int irq, void *dev_id) 
			vortex_error(dev, status);



		if (--work_done < 0) {

			pr_warning("%s: Too much work in interrupt, status %4.4x.\n",

			pr_warn("%s: Too much work in interrupt, status %4.4x\n",

				dev->name, status);

			/* Disable all pending interrupts. */

			do {
@@ -2620,7 +2619,8 @@ boomerang_rx(struct net_device *dev) 
			if (skb == NULL) {

				static unsigned long last_jif;

				if (time_after(jiffies, last_jif + 10 * HZ)) {

					pr_warning("%s: memory shortage\n", dev->name);

					pr_warn("%s: memory shortage\n",

						dev->name);

					last_jif = jiffies;

				}

				if ((vp->cur_rx - vp->dirty_rx) == RX_RING_SIZE)
@@ -2719,7 +2719,8 @@ vortex_close(struct net_device *dev) 
	if (vp->rx_csumhits &&

	    (vp->drv_flags & HAS_HWCKSM) == 0 &&

	    (vp->card_idx >= MAX_UNITS || hw_checksums[vp->card_idx] == -1)) {

		pr_warning("%s supports hardware checksums, and we're not using them!\n", dev->name);

		pr_warn("%s supports hardware checksums, and we're not using them!\n",

			dev->name);

	}

#endif

drivers/net/ethernet/broadcom/b44.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static void b44_wap54g10_workaround(struct b44 *bp) 
	}

	return;

error:

	pr_warning("PHY: cannot reset MII transceiver isolate bit\n");

	pr_warn("PHY: cannot reset MII transceiver isolate bit\n");

}

#else

static inline void b44_wap54g10_workaround(struct b44 *bp)

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

+1 −2
Original line number Diff line number Diff line
@@ -847,8 +847,7 @@ int vnic_dev_intr_coal_timer_info(struct vnic_dev *vdev) 
	 */

	if ((err == ERR_ECMDUNKNOWN) ||

		(!err && !(vdev->args[0] && vdev->args[1] && vdev->args[2]))) {

		pr_warning("Using default conversion factor for "

			"interrupt coalesce timer\n");

		pr_warn("Using default conversion factor for interrupt coalesce timer\n");

		vnic_dev_intr_coal_timer_info_default(vdev);

		return 0;

	}