gianfar: Use pr_<level>, netdev_<level> and netif_<level>

Use the current logging styles. Add #define DEBUG to get same output for <foo>_dbg messages. Convert a few bare printks to pr_err. Fix a likely copy/paste defect where a test was done with RX values: if (num_rx_qs > MAX_RX_QS) { but TX limits were emitted: printk(KERN_ERR "num_rx_qs(=%d) greater than MAX_RX_QS(=%d)\n", num_tx_qs, MAX_TX_QS); Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>

gianfar: Use pr_<level>, netdev_<level> and netif_<level>
Use the current logging styles. Add #define DEBUG to get same output for <foo>_dbg messages. Convert a few bare printks to pr_err. Fix a likely copy/paste defect where a test was done with RX values: if (num_rx_qs > MAX_RX_QS) { but TX limits were emitted: printk(KERN_ERR "num_rx_qs(=%d) greater than MAX_RX_QS(=%d)\n", num_tx_qs, MAX_TX_QS); Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
Joe Perches · David S. Miller
1 parent ea11073387
Showing 2 changed files with 58 additions and 76 deletions Side-by-side Diff
drivers/net/gianfar.c
drivers/net/gianfar_ethtool.c
@@ -62,6 +62,9 @@
  *  The driver then cleans up the buffer.
  */
  
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#define DEBUG
+
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>
@@ -213,8 +216,7 @@
 			} else {
 				skb = gfar_new_skb(ndev);
 				if (!skb) {
-					pr_err("%s: Can't allocate RX buffers\n",
-							ndev->name);
+					netdev_err(ndev, "Can't allocate RX buffers\n");
 					goto err_rxalloc_fail;
 				}
 				rx_queue->rx_skbuff[j] = skb;
@@ -258,9 +260,8 @@
 			sizeof(struct rxbd8) * priv->total_rx_ring_size,
 			&addr, GFP_KERNEL);
 	if (!vaddr) {
-		if (netif_msg_ifup(priv))
-			pr_err("%s: Could not allocate buffer descriptors!\n",
-			       ndev->name);
+		netif_err(priv, ifup, ndev,
+			  "Could not allocate buffer descriptors!\n");
 		return -ENOMEM;
 	}
  
@@ -290,9 +291,8 @@
 		tx_queue->tx_skbuff = kmalloc(sizeof(*tx_queue->tx_skbuff) *
 				  tx_queue->tx_ring_size, GFP_KERNEL);
 		if (!tx_queue->tx_skbuff) {
-			if (netif_msg_ifup(priv))
-				pr_err("%s: Could not allocate tx_skbuff\n",
-						ndev->name);
+			netif_err(priv, ifup, ndev,
+				  "Could not allocate tx_skbuff\n");
 			goto cleanup;
 		}
  
@@ -306,9 +306,8 @@
 				  rx_queue->rx_ring_size, GFP_KERNEL);
  
 		if (!rx_queue->rx_skbuff) {
-			if (netif_msg_ifup(priv))
-				pr_err("%s: Could not allocate rx_skbuff\n",
-				       ndev->name);
+			netif_err(priv, ifup, ndev,
+				  "Could not allocate rx_skbuff\n");
 			goto cleanup;
 		}
  
@@ -628,9 +627,9 @@
 	num_tx_qs = tx_queues ? *tx_queues : 1;
  
 	if (num_tx_qs > MAX_TX_QS) {
-		printk(KERN_ERR "num_tx_qs(=%d) greater than MAX_TX_QS(=%d)\n",
-				num_tx_qs, MAX_TX_QS);
-		printk(KERN_ERR "Cannot do alloc_etherdev, aborting\n");
+		pr_err("num_tx_qs(=%d) greater than MAX_TX_QS(=%d)\n",
+		       num_tx_qs, MAX_TX_QS);
+		pr_err("Cannot do alloc_etherdev, aborting\n");
 		return -EINVAL;
 	}
  
@@ -638,9 +637,9 @@
 	num_rx_qs = rx_queues ? *rx_queues : 1;
  
 	if (num_rx_qs > MAX_RX_QS) {
-		printk(KERN_ERR "num_rx_qs(=%d) greater than MAX_RX_QS(=%d)\n",
-				num_tx_qs, MAX_TX_QS);
-		printk(KERN_ERR "Cannot do alloc_etherdev, aborting\n");
+		pr_err("num_rx_qs(=%d) greater than MAX_RX_QS(=%d)\n",
+		       num_rx_qs, MAX_RX_QS);
+		pr_err("Cannot do alloc_etherdev, aborting\n");
 		return -EINVAL;
 	}
  
@@ -1163,8 +1162,7 @@
 	err = register_netdev(dev);
  
 	if (err) {
-		printk(KERN_ERR "%s: Cannot register net device, aborting.\n",
-				dev->name);
+		pr_err("%s: Cannot register net device, aborting\n", dev->name);
 		goto register_fail;
 	}
  
  
  
  
@@ -1215,17 +1213,17 @@
 	gfar_init_sysfs(dev);
  
 	/* Print out the device info */
-	printk(KERN_INFO DEVICE_NAME "%pM\n", dev->name, dev->dev_addr);
+	netdev_info(dev, "mac: %pM\n", dev->dev_addr);
  
 	/* Even more device info helps when determining which kernel */
 	/* provided which set of benchmarks. */
-	printk(KERN_INFO "%s: Running with NAPI enabled\n", dev->name);
+	netdev_info(dev, "Running with NAPI enabled\n");
 	for (i = 0; i < priv->num_rx_queues; i++)
-		printk(KERN_INFO "%s: RX BD ring size for Q[%d]: %d\n",
-			dev->name, i, priv->rx_queue[i]->rx_ring_size);
+		netdev_info(dev, "RX BD ring size for Q[%d]: %d\n",
+			    i, priv->rx_queue[i]->rx_ring_size);
 	for(i = 0; i < priv->num_tx_queues; i++)
-		 printk(KERN_INFO "%s: TX BD ring size for Q[%d]: %d\n",
-			dev->name, i, priv->tx_queue[i]->tx_ring_size);
+		netdev_info(dev, "TX BD ring size for Q[%d]: %d\n",
+			    i, priv->tx_queue[i]->tx_ring_size);
  
 	return 0;
  
  
  
  
@@ -1858,34 +1856,30 @@
 		 * Transmit, and Receive */
 		if ((err = request_irq(grp->interruptError, gfar_error, 0,
 				grp->int_name_er,grp)) < 0) {
-			if (netif_msg_intr(priv))
-				printk(KERN_ERR "%s: Can't get IRQ %d\n",
-					dev->name, grp->interruptError);
+			netif_err(priv, intr, dev, "Can't get IRQ %d\n",
+				  grp->interruptError);
  
 			goto err_irq_fail;
 		}
  
 		if ((err = request_irq(grp->interruptTransmit, gfar_transmit,
 				0, grp->int_name_tx, grp)) < 0) {
-			if (netif_msg_intr(priv))
-				printk(KERN_ERR "%s: Can't get IRQ %d\n",
-					dev->name, grp->interruptTransmit);
+			netif_err(priv, intr, dev, "Can't get IRQ %d\n",
+				  grp->interruptTransmit);
 			goto tx_irq_fail;
 		}
  
 		if ((err = request_irq(grp->interruptReceive, gfar_receive, 0,
 				grp->int_name_rx, grp)) < 0) {
-			if (netif_msg_intr(priv))
-				printk(KERN_ERR "%s: Can't get IRQ %d\n",
-					dev->name, grp->interruptReceive);
+			netif_err(priv, intr, dev, "Can't get IRQ %d\n",
+				  grp->interruptReceive);
 			goto rx_irq_fail;
 		}
 	} else {
 		if ((err = request_irq(grp->interruptTransmit, gfar_interrupt, 0,
 				grp->int_name_tx, grp)) < 0) {
-			if (netif_msg_intr(priv))
-				printk(KERN_ERR "%s: Can't get IRQ %d\n",
-					dev->name, grp->interruptTransmit);
+			netif_err(priv, intr, dev, "Can't get IRQ %d\n",
+				  grp->interruptTransmit);
 			goto err_irq_fail;
 		}
 	}
@@ -2354,9 +2348,7 @@
 		frame_size += VLAN_HLEN;
  
 	if ((frame_size < 64) || (frame_size > JUMBO_FRAME_SIZE)) {
-		if (netif_msg_drv(priv))
-			printk(KERN_ERR "%s: Invalid MTU setting\n",
-					dev->name);
+		netif_err(priv, drv, dev, "Invalid MTU setting\n");
 		return -EINVAL;
 	}
  
@@ -2776,9 +2768,7 @@
 				gfar_process_frame(dev, skb, amount_pull);
  
 			} else {
-				if (netif_msg_rx_err(priv))
-					printk(KERN_WARNING
-					       "%s: Missing skb!\n", dev->name);
+				netif_warn(priv, rx_err, dev, "Missing skb!\n");
 				rx_queue->stats.rx_dropped++;
 				priv->extra_stats.rx_skbmissing++;
 			}
@@ -2981,10 +2971,9 @@
 					ecntrl &= ~(ECNTRL_R100);
 				break;
 			default:
-				if (netif_msg_link(priv))
-					printk(KERN_WARNING
-						"%s: Ack!  Speed (%d) is not 10/100/1000!\n",
-						dev->name, phydev->speed);
+				netif_warn(priv, link, dev,
+					   "Ack!  Speed (%d) is not 10/100/1000!\n",
+					   phydev->speed);
 				break;
 			}
  
@@ -3189,8 +3178,8 @@
  
 	/* Hmm... */
 	if (netif_msg_rx_err(priv) || netif_msg_tx_err(priv))
-		printk(KERN_DEBUG "%s: error interrupt (ievent=0x%08x imask=0x%08x)\n",
-		       dev->name, events, gfar_read(&regs->imask));
+		netdev_dbg(dev, "error interrupt (ievent=0x%08x imask=0x%08x)\n",
+			   events, gfar_read(&regs->imask));
  
 	/* Update the error counters */
 	if (events & IEVENT_TXE) {
@@ -3203,9 +3192,8 @@
 		if (events & IEVENT_XFUN) {
 			unsigned long flags;
  
-			if (netif_msg_tx_err(priv))
-				printk(KERN_DEBUG "%s: TX FIFO underrun, "
-				       "packet dropped.\n", dev->name);
+			netif_dbg(priv, tx_err, dev,
+				  "TX FIFO underrun, packet dropped\n");
 			dev->stats.tx_dropped++;
 			priv->extra_stats.tx_underrun++;
  
@@ -3218,8 +3206,7 @@
 			unlock_tx_qs(priv);
 			local_irq_restore(flags);
 		}
-		if (netif_msg_tx_err(priv))
-			printk(KERN_DEBUG "%s: Transmit Error\n", dev->name);
+		netif_dbg(priv, tx_err, dev, "Transmit Error\n");
 	}
 	if (events & IEVENT_BSY) {
 		dev->stats.rx_errors++;
  
  
  
  
@@ -3227,29 +3214,25 @@
  
 		gfar_receive(irq, grp_id);
  
-		if (netif_msg_rx_err(priv))
-			printk(KERN_DEBUG "%s: busy error (rstat: %x)\n",
-			       dev->name, gfar_read(&regs->rstat));
+		netif_dbg(priv, rx_err, dev, "busy error (rstat: %x)\n",
+			  gfar_read(&regs->rstat));
 	}
 	if (events & IEVENT_BABR) {
 		dev->stats.rx_errors++;
 		priv->extra_stats.rx_babr++;
  
-		if (netif_msg_rx_err(priv))
-			printk(KERN_DEBUG "%s: babbling RX error\n", dev->name);
+		netif_dbg(priv, rx_err, dev, "babbling RX error\n");
 	}
 	if (events & IEVENT_EBERR) {
 		priv->extra_stats.eberr++;
-		if (netif_msg_rx_err(priv))
-			printk(KERN_DEBUG "%s: bus error\n", dev->name);
+		netif_dbg(priv, rx_err, dev, "bus error\n");
 	}
-	if ((events & IEVENT_RXC) && netif_msg_rx_status(priv))
-		printk(KERN_DEBUG "%s: control frame\n", dev->name);
+	if (events & IEVENT_RXC)
+		netif_dbg(priv, rx_status, dev, "control frame\n");
  
 	if (events & IEVENT_BABT) {
 		priv->extra_stats.tx_babt++;
-		if (netif_msg_tx_err(priv))
-			printk(KERN_DEBUG "%s: babbling TX error\n", dev->name);
+		netif_dbg(priv, tx_err, dev, "babbling TX error\n");
 	}
 	return IRQ_HANDLED;
 }
@@ -16,6 +16,8 @@
  *  by reference.
  */
  
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>
  
@@ -375,13 +377,13 @@
 	/* Check the bounds of the values */
 	if (cvals->rx_coalesce_usecs > GFAR_MAX_COAL_USECS) {
 		pr_info("Coalescing is limited to %d microseconds\n",
-				GFAR_MAX_COAL_USECS);
+			GFAR_MAX_COAL_USECS);
 		return -EINVAL;
 	}
  
 	if (cvals->rx_max_coalesced_frames > GFAR_MAX_COAL_FRAMES) {
 		pr_info("Coalescing is limited to %d frames\n",
-				GFAR_MAX_COAL_FRAMES);
+			GFAR_MAX_COAL_FRAMES);
 		return -EINVAL;
 	}
  
  
@@ -404,13 +406,13 @@
 	/* Check the bounds of the values */
 	if (cvals->tx_coalesce_usecs > GFAR_MAX_COAL_USECS) {
 		pr_info("Coalescing is limited to %d microseconds\n",
-				GFAR_MAX_COAL_USECS);
+			GFAR_MAX_COAL_USECS);
 		return -EINVAL;
 	}
  
 	if (cvals->tx_max_coalesced_frames > GFAR_MAX_COAL_FRAMES) {
 		pr_info("Coalescing is limited to %d frames\n",
-				GFAR_MAX_COAL_FRAMES);
+			GFAR_MAX_COAL_FRAMES);
 		return -EINVAL;
 	}
  
@@ -464,8 +466,7 @@
 		return -EINVAL;
  
 	if (!is_power_of_2(rvals->rx_pending)) {
-		printk("%s: Ring sizes must be a power of 2\n",
-				dev->name);
+		netdev_err(dev, "Ring sizes must be a power of 2\n");
 		return -EINVAL;
 	}
  
@@ -473,8 +474,7 @@
 		return -EINVAL;
  
 	if (!is_power_of_2(rvals->tx_pending)) {
-		printk("%s: Ring sizes must be a power of 2\n",
-				dev->name);
+		netdev_err(dev, "Ring sizes must be a power of 2\n");
 		return -EINVAL;
 	}
  
@@ -700,7 +700,7 @@
 		cmp_rqfpr = RQFPR_IPV6 |RQFPR_UDP;
 		break;
 	default:
-		printk(KERN_ERR "Right now this class is not supported\n");
+		pr_err("Right now this class is not supported\n");
 		return 0;
 	}
  
@@ -715,8 +715,7 @@
 	}
  
 	if (i == MAX_FILER_IDX + 1) {
-		printk(KERN_ERR "No parse rule found, ");
-		printk(KERN_ERR "can't create hash rules\n");
+		pr_err("No parse rule found, can't create hash rules\n");
 		return 0;
 	}
...	...	@@ -62,6 +62,9 @@
62	62	* The driver then cleans up the buffer.
63	63	*/
64	64
	65	+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
	66	+#define DEBUG
	67	+
65	68	#include <linux/kernel.h>
66	69	#include <linux/string.h>
67	70	#include <linux/errno.h>
...	...	@@ -213,8 +216,7 @@
213	216	} else {
214	217	skb = gfar_new_skb(ndev);
215	218	if (!skb) {
216		- pr_err("%s: Can't allocate RX buffers\n",
217		- ndev->name);
	219	+ netdev_err(ndev, "Can't allocate RX buffers\n");
218	220	goto err_rxalloc_fail;
219	221	}
220	222	rx_queue->rx_skbuff[j] = skb;
...	...	@@ -258,9 +260,8 @@
258	260	sizeof(struct rxbd8) * priv->total_rx_ring_size,
259	261	&addr, GFP_KERNEL);
260	262	if (!vaddr) {
261		- if (netif_msg_ifup(priv))
262		- pr_err("%s: Could not allocate buffer descriptors!\n",
263		- ndev->name);
	263	+ netif_err(priv, ifup, ndev,
	264	+ "Could not allocate buffer descriptors!\n");
264	265	return -ENOMEM;
265	266	}
266	267
...	...	@@ -290,9 +291,8 @@
290	291	tx_queue->tx_skbuff = kmalloc(sizeof(tx_queue->tx_skbuff)
291	292	tx_queue->tx_ring_size, GFP_KERNEL);
292	293	if (!tx_queue->tx_skbuff) {
293		- if (netif_msg_ifup(priv))
294		- pr_err("%s: Could not allocate tx_skbuff\n",
295		- ndev->name);
	294	+ netif_err(priv, ifup, ndev,
	295	+ "Could not allocate tx_skbuff\n");
296	296	goto cleanup;
297	297	}
298	298
...	...	@@ -306,9 +306,8 @@
306	306	rx_queue->rx_ring_size, GFP_KERNEL);
307	307
308	308	if (!rx_queue->rx_skbuff) {
309		- if (netif_msg_ifup(priv))
310		- pr_err("%s: Could not allocate rx_skbuff\n",
311		- ndev->name);
	309	+ netif_err(priv, ifup, ndev,
	310	+ "Could not allocate rx_skbuff\n");
312	311	goto cleanup;
313	312	}
314	313
...	...	@@ -628,9 +627,9 @@
628	627	num_tx_qs = tx_queues ? *tx_queues : 1;
629	628
630	629	if (num_tx_qs > MAX_TX_QS) {
631		- printk(KERN_ERR "num_tx_qs(=%d) greater than MAX_TX_QS(=%d)\n",
632		- num_tx_qs, MAX_TX_QS);
633		- printk(KERN_ERR "Cannot do alloc_etherdev, aborting\n");
	630	+ pr_err("num_tx_qs(=%d) greater than MAX_TX_QS(=%d)\n",
	631	+ num_tx_qs, MAX_TX_QS);
	632	+ pr_err("Cannot do alloc_etherdev, aborting\n");
634	633	return -EINVAL;
635	634	}
636	635
...	...	@@ -638,9 +637,9 @@
638	637	num_rx_qs = rx_queues ? *rx_queues : 1;
639	638
640	639	if (num_rx_qs > MAX_RX_QS) {
641		- printk(KERN_ERR "num_rx_qs(=%d) greater than MAX_RX_QS(=%d)\n",
642		- num_tx_qs, MAX_TX_QS);
643		- printk(KERN_ERR "Cannot do alloc_etherdev, aborting\n");
	640	+ pr_err("num_rx_qs(=%d) greater than MAX_RX_QS(=%d)\n",
	641	+ num_rx_qs, MAX_RX_QS);
	642	+ pr_err("Cannot do alloc_etherdev, aborting\n");
644	643	return -EINVAL;
645	644	}
646	645
...	...	@@ -1163,8 +1162,7 @@
1163	1162	err = register_netdev(dev);
1164	1163
1165	1164	if (err) {
1166		- printk(KERN_ERR "%s: Cannot register net device, aborting.\n",
1167		- dev->name);
	1165	+ pr_err("%s: Cannot register net device, aborting\n", dev->name);
1168	1166	goto register_fail;
1169	1167	}
1170	1168
1171	1169
1172	1170
1173	1171
...	...	@@ -1215,17 +1213,17 @@
1215	1213	gfar_init_sysfs(dev);
1216	1214
1217	1215	/* Print out the device info */
1218		- printk(KERN_INFO DEVICE_NAME "%pM\n", dev->name, dev->dev_addr);
	1216	+ netdev_info(dev, "mac: %pM\n", dev->dev_addr);
1219	1217
1220	1218	/* Even more device info helps when determining which kernel */
1221	1219	/* provided which set of benchmarks. */
1222		- printk(KERN_INFO "%s: Running with NAPI enabled\n", dev->name);
	1220	+ netdev_info(dev, "Running with NAPI enabled\n");
1223	1221	for (i = 0; i < priv->num_rx_queues; i++)
1224		- printk(KERN_INFO "%s: RX BD ring size for Q[%d]: %d\n",
1225		- dev->name, i, priv->rx_queue[i]->rx_ring_size);
	1222	+ netdev_info(dev, "RX BD ring size for Q[%d]: %d\n",
	1223	+ i, priv->rx_queue[i]->rx_ring_size);
1226	1224	for(i = 0; i < priv->num_tx_queues; i++)
1227		- printk(KERN_INFO "%s: TX BD ring size for Q[%d]: %d\n",
1228		- dev->name, i, priv->tx_queue[i]->tx_ring_size);
	1225	+ netdev_info(dev, "TX BD ring size for Q[%d]: %d\n",
	1226	+ i, priv->tx_queue[i]->tx_ring_size);
1229	1227
1230	1228	return 0;
1231	1229
1232	1230
1233	1231
1234	1232
...	...	@@ -1858,34 +1856,30 @@
1858	1856	* Transmit, and Receive */
1859	1857	if ((err = request_irq(grp->interruptError, gfar_error, 0,
1860	1858	grp->int_name_er,grp)) < 0) {
1861		- if (netif_msg_intr(priv))
1862		- printk(KERN_ERR "%s: Can't get IRQ %d\n",
1863		- dev->name, grp->interruptError);
	1859	+ netif_err(priv, intr, dev, "Can't get IRQ %d\n",
	1860	+ grp->interruptError);
1864	1861
1865	1862	goto err_irq_fail;
1866	1863	}
1867	1864
1868	1865	if ((err = request_irq(grp->interruptTransmit, gfar_transmit,
1869	1866	0, grp->int_name_tx, grp)) < 0) {
1870		- if (netif_msg_intr(priv))
1871		- printk(KERN_ERR "%s: Can't get IRQ %d\n",
1872		- dev->name, grp->interruptTransmit);
	1867	+ netif_err(priv, intr, dev, "Can't get IRQ %d\n",
	1868	+ grp->interruptTransmit);
1873	1869	goto tx_irq_fail;
1874	1870	}
1875	1871
1876	1872	if ((err = request_irq(grp->interruptReceive, gfar_receive, 0,
1877	1873	grp->int_name_rx, grp)) < 0) {
1878		- if (netif_msg_intr(priv))
1879		- printk(KERN_ERR "%s: Can't get IRQ %d\n",
1880		- dev->name, grp->interruptReceive);
	1874	+ netif_err(priv, intr, dev, "Can't get IRQ %d\n",
	1875	+ grp->interruptReceive);
1881	1876	goto rx_irq_fail;
1882	1877	}
1883	1878	} else {
1884	1879	if ((err = request_irq(grp->interruptTransmit, gfar_interrupt, 0,
1885	1880	grp->int_name_tx, grp)) < 0) {
1886		- if (netif_msg_intr(priv))
1887		- printk(KERN_ERR "%s: Can't get IRQ %d\n",
1888		- dev->name, grp->interruptTransmit);
	1881	+ netif_err(priv, intr, dev, "Can't get IRQ %d\n",
	1882	+ grp->interruptTransmit);
1889	1883	goto err_irq_fail;
1890	1884	}
1891	1885	}
...	...	@@ -2354,9 +2348,7 @@
2354	2348	frame_size += VLAN_HLEN;
2355	2349
2356	2350	if ((frame_size < 64) \|\| (frame_size > JUMBO_FRAME_SIZE)) {
2357		- if (netif_msg_drv(priv))
2358		- printk(KERN_ERR "%s: Invalid MTU setting\n",
2359		- dev->name);
	2351	+ netif_err(priv, drv, dev, "Invalid MTU setting\n");
2360	2352	return -EINVAL;
2361	2353	}
2362	2354
...	...	@@ -2776,9 +2768,7 @@
2776	2768	gfar_process_frame(dev, skb, amount_pull);
2777	2769
2778	2770	} else {
2779		- if (netif_msg_rx_err(priv))
2780		- printk(KERN_WARNING
2781		- "%s: Missing skb!\n", dev->name);
	2771	+ netif_warn(priv, rx_err, dev, "Missing skb!\n");
2782	2772	rx_queue->stats.rx_dropped++;
2783	2773	priv->extra_stats.rx_skbmissing++;
2784	2774	}
...	...	@@ -2981,10 +2971,9 @@
2981	2971	ecntrl &= ~(ECNTRL_R100);
2982	2972	break;
2983	2973	default:
2984		- if (netif_msg_link(priv))
2985		- printk(KERN_WARNING
2986		- "%s: Ack! Speed (%d) is not 10/100/1000!\n",
2987		- dev->name, phydev->speed);
	2974	+ netif_warn(priv, link, dev,
	2975	+ "Ack! Speed (%d) is not 10/100/1000!\n",
	2976	+ phydev->speed);
2988	2977	break;
2989	2978	}
2990	2979
...	...	@@ -3189,8 +3178,8 @@
3189	3178
3190	3179	/* Hmm... */
3191	3180	if (netif_msg_rx_err(priv) \|\| netif_msg_tx_err(priv))
3192		- printk(KERN_DEBUG "%s: error interrupt (ievent=0x%08x imask=0x%08x)\n",
3193		- dev->name, events, gfar_read(&regs->imask));
	3181	+ netdev_dbg(dev, "error interrupt (ievent=0x%08x imask=0x%08x)\n",
	3182	+ events, gfar_read(&regs->imask));
3194	3183
3195	3184	/* Update the error counters */
3196	3185	if (events & IEVENT_TXE) {
...	...	@@ -3203,9 +3192,8 @@
3203	3192	if (events & IEVENT_XFUN) {
3204	3193	unsigned long flags;
3205	3194
3206		- if (netif_msg_tx_err(priv))
3207		- printk(KERN_DEBUG "%s: TX FIFO underrun, "
3208		- "packet dropped.\n", dev->name);
	3195	+ netif_dbg(priv, tx_err, dev,
	3196	+ "TX FIFO underrun, packet dropped\n");
3209	3197	dev->stats.tx_dropped++;
3210	3198	priv->extra_stats.tx_underrun++;
3211	3199
...	...	@@ -3218,8 +3206,7 @@
3218	3206	unlock_tx_qs(priv);
3219	3207	local_irq_restore(flags);
3220	3208	}
3221		- if (netif_msg_tx_err(priv))
3222		- printk(KERN_DEBUG "%s: Transmit Error\n", dev->name);
	3209	+ netif_dbg(priv, tx_err, dev, "Transmit Error\n");
3223	3210	}
3224	3211	if (events & IEVENT_BSY) {
3225	3212	dev->stats.rx_errors++;
3226	3213
3227	3214
3228	3215
3229	3216
...	...	@@ -3227,29 +3214,25 @@
3227	3214
3228	3215	gfar_receive(irq, grp_id);
3229	3216
3230		- if (netif_msg_rx_err(priv))
3231		- printk(KERN_DEBUG "%s: busy error (rstat: %x)\n",
3232		- dev->name, gfar_read(&regs->rstat));
	3217	+ netif_dbg(priv, rx_err, dev, "busy error (rstat: %x)\n",
	3218	+ gfar_read(&regs->rstat));
3233	3219	}
3234	3220	if (events & IEVENT_BABR) {
3235	3221	dev->stats.rx_errors++;
3236	3222	priv->extra_stats.rx_babr++;
3237	3223
3238		- if (netif_msg_rx_err(priv))
3239		- printk(KERN_DEBUG "%s: babbling RX error\n", dev->name);
	3224	+ netif_dbg(priv, rx_err, dev, "babbling RX error\n");
3240	3225	}
3241	3226	if (events & IEVENT_EBERR) {
3242	3227	priv->extra_stats.eberr++;
3243		- if (netif_msg_rx_err(priv))
3244		- printk(KERN_DEBUG "%s: bus error\n", dev->name);
	3228	+ netif_dbg(priv, rx_err, dev, "bus error\n");
3245	3229	}
3246		- if ((events & IEVENT_RXC) && netif_msg_rx_status(priv))
3247		- printk(KERN_DEBUG "%s: control frame\n", dev->name);
	3230	+ if (events & IEVENT_RXC)
	3231	+ netif_dbg(priv, rx_status, dev, "control frame\n");
3248	3232
3249	3233	if (events & IEVENT_BABT) {
3250	3234	priv->extra_stats.tx_babt++;
3251		- if (netif_msg_tx_err(priv))
3252		- printk(KERN_DEBUG "%s: babbling TX error\n", dev->name);
	3235	+ netif_dbg(priv, tx_err, dev, "babbling TX error\n");
3253	3236	}
3254	3237	return IRQ_HANDLED;
3255	3238	}
...	...	@@ -16,6 +16,8 @@
16	16	* by reference.
17	17	*/
18	18
	19	+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
	20	+
19	21	#include <linux/kernel.h>
20	22	#include <linux/string.h>
21	23	#include <linux/errno.h>
22	24
...	...	@@ -375,13 +377,13 @@
375	377	/* Check the bounds of the values */
376	378	if (cvals->rx_coalesce_usecs > GFAR_MAX_COAL_USECS) {
377	379	pr_info("Coalescing is limited to %d microseconds\n",
378		- GFAR_MAX_COAL_USECS);
	380	+ GFAR_MAX_COAL_USECS);
379	381	return -EINVAL;
380	382	}
381	383
382	384	if (cvals->rx_max_coalesced_frames > GFAR_MAX_COAL_FRAMES) {
383	385	pr_info("Coalescing is limited to %d frames\n",
384		- GFAR_MAX_COAL_FRAMES);
	386	+ GFAR_MAX_COAL_FRAMES);
385	387	return -EINVAL;
386	388	}
387	389
388	390
...	...	@@ -404,13 +406,13 @@
404	406	/* Check the bounds of the values */
405	407	if (cvals->tx_coalesce_usecs > GFAR_MAX_COAL_USECS) {
406	408	pr_info("Coalescing is limited to %d microseconds\n",
407		- GFAR_MAX_COAL_USECS);
	409	+ GFAR_MAX_COAL_USECS);
408	410	return -EINVAL;
409	411	}
410	412
411	413	if (cvals->tx_max_coalesced_frames > GFAR_MAX_COAL_FRAMES) {
412	414	pr_info("Coalescing is limited to %d frames\n",
413		- GFAR_MAX_COAL_FRAMES);
	415	+ GFAR_MAX_COAL_FRAMES);
414	416	return -EINVAL;
415	417	}
416	418
...	...	@@ -464,8 +466,7 @@
464	466	return -EINVAL;
465	467
466	468	if (!is_power_of_2(rvals->rx_pending)) {
467		- printk("%s: Ring sizes must be a power of 2\n",
468		- dev->name);
	469	+ netdev_err(dev, "Ring sizes must be a power of 2\n");
469	470	return -EINVAL;
470	471	}
471	472
...	...	@@ -473,8 +474,7 @@
473	474	return -EINVAL;
474	475
475	476	if (!is_power_of_2(rvals->tx_pending)) {
476		- printk("%s: Ring sizes must be a power of 2\n",
477		- dev->name);
	477	+ netdev_err(dev, "Ring sizes must be a power of 2\n");
478	478	return -EINVAL;
479	479	}
480	480
...	...	@@ -700,7 +700,7 @@
700	700	cmp_rqfpr = RQFPR_IPV6 \|RQFPR_UDP;
701	701	break;
702	702	default:
703		- printk(KERN_ERR "Right now this class is not supported\n");
	703	+ pr_err("Right now this class is not supported\n");
704	704	return 0;
705	705	}
706	706
...	...	@@ -715,8 +715,7 @@
715	715	}
716	716
717	717	if (i == MAX_FILER_IDX + 1) {
718		- printk(KERN_ERR "No parse rule found, ");
719		- printk(KERN_ERR "can't create hash rules\n");
	718	+ pr_err("No parse rule found, can't create hash rules\n");
720	719	return 0;
721	720	}
722	721