net: ehernet: ixp4xx: Use netdev_* messages

Simplify and correct a bunch of messages using printk
directly to use the netdev_* macros. I have not changed
all of them, just the low-hanging fruit.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index 05ab842..f7edf8b 100644 (file)
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -572,8 +572,8 @@ static void ixp4xx_adjust_link(struct net_device *dev)
                __raw_writel(DEFAULT_TX_CNTRL0 | TX_CNTRL0_HALFDUPLEX,
                             &port->regs->tx_control[0]);
 
-       printk(KERN_INFO "%s: link up, speed %u Mb/s, %s duplex\n",
-              dev->name, port->speed, port->duplex ? "full" : "half");
+       netdev_info(dev, "%s: link up, speed %u Mb/s, %s duplex\n",
+                   dev->name, port->speed, port->duplex ? "full" : "half");
 }
 
 
@@ -583,7 +583,7 @@ static inline void debug_pkt(struct net_device *dev, const char *func,
 #if DEBUG_PKT_BYTES
        int i;
 
-       printk(KERN_DEBUG "%s: %s(%i) ", dev->name, func, len);
+       netdev_debug(dev, "%s(%i) ", func, len);
        for (i = 0; i < len; i++) {
                if (i >= DEBUG_PKT_BYTES)
                        break;
@@ -674,7 +674,7 @@ static int eth_poll(struct napi_struct *napi, int budget)
        int received = 0;
 
 #if DEBUG_RX
-       printk(KERN_DEBUG "%s: eth_poll\n", dev->name);
+       netdev_debug(dev, "eth_poll\n");
 #endif
 
        while (received < budget) {
@@ -688,23 +688,20 @@ static int eth_poll(struct napi_struct *napi, int budget)
 
                if ((n = queue_get_desc(rxq, port, 0)) < 0) {
 #if DEBUG_RX
-                       printk(KERN_DEBUG "%s: eth_poll napi_complete\n",
-                              dev->name);
+                       netdev_debug(dev, "eth_poll napi_complete\n");
 #endif
                        napi_complete(napi);
                        qmgr_enable_irq(rxq);
                        if (!qmgr_stat_below_low_watermark(rxq) &&
                            napi_reschedule(napi)) { /* not empty again */
 #if DEBUG_RX
-                               printk(KERN_DEBUG "%s: eth_poll napi_reschedule succeeded\n",
-                                      dev->name);
+                               netdev_debug(dev, "eth_poll napi_reschedule succeeded\n");
 #endif
                                qmgr_disable_irq(rxq);
                                continue;
                        }
 #if DEBUG_RX
-                       printk(KERN_DEBUG "%s: eth_poll all done\n",
-                              dev->name);
+                       netdev_debug(dev, "eth_poll all done\n");
 #endif
                        return received; /* all work done */
                }
@@ -769,7 +766,7 @@ static int eth_poll(struct napi_struct *napi, int budget)
        }
 
 #if DEBUG_RX
-       printk(KERN_DEBUG "eth_poll(): end, not all work done\n");
+       netdev_debug(dev, "eth_poll(): end, not all work done\n");
 #endif
        return received;                /* not all work done */
 }
@@ -833,7 +830,7 @@ static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
        struct desc *desc;
 
 #if DEBUG_TX
-       printk(KERN_DEBUG "%s: eth_xmit\n", dev->name);
+       netdev_debug(dev, "eth_xmit\n");
 #endif
 
        if (unlikely(skb->len > MAX_MRU)) {
@@ -888,22 +885,21 @@ static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
 
        if (qmgr_stat_below_low_watermark(txreadyq)) { /* empty */
 #if DEBUG_TX
-               printk(KERN_DEBUG "%s: eth_xmit queue full\n", dev->name);
+               netdev_debug(dev, "eth_xmit queue full\n");
 #endif
                netif_stop_queue(dev);
                /* we could miss TX ready interrupt */
                /* really empty in fact */
                if (!qmgr_stat_below_low_watermark(txreadyq)) {
 #if DEBUG_TX
-                       printk(KERN_DEBUG "%s: eth_xmit ready again\n",
-                              dev->name);
+                       netdev_debug(dev, "eth_xmit ready again\n");
 #endif
                        netif_wake_queue(dev);
                }
        }
 
 #if DEBUG_TX
-       printk(KERN_DEBUG "%s: eth_xmit end\n", dev->name);
+       netdev_debug(dev, "eth_xmit end\n");
 #endif
 
        ixp_tx_timestamp(port, skb);
@@ -1177,8 +1173,7 @@ static int eth_open(struct net_device *dev)
                        return err;
 
                if (npe_recv_message(npe, &msg, "ETH_GET_STATUS")) {
-                       printk(KERN_ERR "%s: %s not responding\n", dev->name,
-                              npe_name(npe));
+                       netdev_err(dev, "%s not responding\n", npe_name(npe));
                        return -EIO;
                }
                port->firmware[0] = msg.byte4;
@@ -1290,7 +1285,7 @@ static int eth_close(struct net_device *dev)
        msg.eth_id = port->id;
        msg.byte3 = 1;
        if (npe_send_recv_message(port->npe, &msg, "ETH_ENABLE_LOOPBACK"))
-               printk(KERN_CRIT "%s: unable to enable loopback\n", dev->name);
+               netdev_crit(dev, "unable to enable loopback\n");
 
        i = 0;
        do {                    /* drain RX buffers */
@@ -1314,11 +1309,11 @@ static int eth_close(struct net_device *dev)
        } while (++i < MAX_CLOSE_WAIT);
 
        if (buffs)
-               printk(KERN_CRIT "%s: unable to drain RX queue, %i buffer(s)"
-                      " left in NPE\n", dev->name, buffs);
+               netdev_crit(dev, "unable to drain RX queue, %i buffer(s)"
+                           " left in NPE\n", buffs);
 #if DEBUG_CLOSE
        if (!buffs)
-               printk(KERN_DEBUG "Draining RX queue took %i cycles\n", i);
+               netdev_debug(dev, "draining RX queue took %i cycles\n", i);
 #endif
 
        buffs = TX_DESCS;
@@ -1334,17 +1329,16 @@ static int eth_close(struct net_device *dev)
        } while (++i < MAX_CLOSE_WAIT);
 
        if (buffs)
-               printk(KERN_CRIT "%s: unable to drain TX queue, %i buffer(s) "
-                      "left in NPE\n", dev->name, buffs);
+               netdev_crit(dev, "unable to drain TX queue, %i buffer(s) "
+                           "left in NPE\n", buffs);
 #if DEBUG_CLOSE
        if (!buffs)
-               printk(KERN_DEBUG "Draining TX queues took %i cycles\n", i);
+               netdev_debug(dev, "draining TX queues took %i cycles\n", i);
 #endif
 
        msg.byte3 = 0;
        if (npe_send_recv_message(port->npe, &msg, "ETH_DISABLE_LOOPBACK"))
-               printk(KERN_CRIT "%s: unable to disable loopback\n",
-                      dev->name);
+               netdev_crit(dev, "unable to disable loopback\n");
 
        phy_stop(dev->phydev);
 
@@ -1476,8 +1470,8 @@ static int ixp4xx_eth_probe(struct platform_device *pdev)
        if ((err = register_netdev(ndev)))
                goto err_phy_dis;
 
-       printk(KERN_INFO "%s: MII PHY %i on %s\n", ndev->name, plat->phy,
-              npe_name(port->npe));
+       netdev_info(ndev, "%s: MII PHY %i on %s\n", ndev->name, plat->phy,
+                   npe_name(port->npe));
 
        return 0;