1 files changed, 25 insertions, 38 deletions

diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index 6354ab3a45a6..2e2c69b24062 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -21,6 +21,8 @@
  * KS8851 16bit MLL chip from Micrel Inc.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
@@ -361,7 +363,6 @@ static u8 KS_DEFAULT_MAC_ADDRESS[] = { 0x00, 0x10, 0xA1, 0x86, 0x95, 0x11 };
 
 #define MAX_MCAST_LST                   32
 #define HW_MCAST_SIZE                   8
-#define MAC_ADDR_LEN                    6
 
 /**
  * union ks_tx_hdr - tx header data
@@ -449,7 +450,7 @@ struct ks_net {
         u16                     promiscuous;
         u16                     all_mcast;
         u16                     mcast_lst_size;
-        u8                      mcast_lst[MAX_MCAST_LST][MAC_ADDR_LEN];
+        u8                      mcast_lst[MAX_MCAST_LST][ETH_ALEN];
         u8                      mcast_bits[HW_MCAST_SIZE];
         u8                      mac_addr[6];
         u8                      fid;
@@ -459,11 +460,6 @@ struct ks_net {
 
 static int msg_enable;
 
-#define ks_info(_ks, _msg...) dev_info(&(_ks)->pdev->dev, _msg)
-#define ks_warn(_ks, _msg...) dev_warn(&(_ks)->pdev->dev, _msg)
-#define ks_dbg(_ks, _msg...) dev_dbg(&(_ks)->pdev->dev, _msg)
-#define ks_err(_ks, _msg...) dev_err(&(_ks)->pdev->dev, _msg)
-
 #define BE3             0x8000      /* Byte Enable 3 */
 #define BE2             0x4000      /* Byte Enable 2 */
 #define BE1             0x2000      /* Byte Enable 1 */
@@ -625,8 +621,7 @@ static void ks_set_powermode(struct ks_net *ks, unsigned pwrmode)
 {
         unsigned pmecr;
 
-        if (netif_msg_hw(ks))
-                ks_dbg(ks, "setting power mode %d\n", pwrmode);
+        netif_dbg(ks, hw, ks->netdev, "setting power mode %d\n", pwrmode);
 
         ks_rdreg16(ks, KS_GRR);
         pmecr = ks_rdreg16(ks, KS_PMECR);
@@ -806,11 +801,10 @@ static void ks_rcv(struct ks_net *ks, struct net_device *netdev)
                         /* read data block including CRC 4 bytes */
                         ks_read_qmu(ks, (u16 *)skb->data, frame_hdr->len);
                         skb_put(skb, frame_hdr->len);
-                        skb->dev = netdev;
                         skb->protocol = eth_type_trans(skb, netdev);
                         netif_rx(skb);
                 } else {
-                        printk(KERN_ERR "%s: err:skb alloc\n", __func__);
+                        pr_err("%s: err:skb alloc\n", __func__);
                         ks_wrreg16(ks, KS_RXQCR, (ks->rc_rxqcr | RXQCR_RRXEF));
                         if (skb)
                                 dev_kfree_skb_irq(skb);
@@ -837,9 +831,8 @@ static void ks_update_link_status(struct net_device *netdev, struct ks_net *ks)
                 netif_carrier_off(netdev);
                 link_up_status = false;
         }
-        if (netif_msg_link(ks))
-                ks_dbg(ks, "%s: %s\n",
-                        __func__, link_up_status ? "UP" : "DOWN");
+        netif_dbg(ks, link, ks->netdev,
+                  "%s: %s\n", __func__, link_up_status ? "UP" : "DOWN");
 }
 
 /**
@@ -909,15 +902,13 @@ static int ks_net_open(struct net_device *netdev)
          * else at the moment.
          */
 
-        if (netif_msg_ifup(ks))
-                ks_dbg(ks, "%s - entry\n", __func__);
+        netif_dbg(ks, ifup, ks->netdev, "%s - entry\n", __func__);
 
         /* reset the HW */
         err = request_irq(ks->irq, ks_irq, KS_INT_FLAGS, DRV_NAME, netdev);
 
         if (err) {
-                printk(KERN_ERR "Failed to request IRQ: %d: %d\n",
-                        ks->irq, err);
+                pr_err("Failed to request IRQ: %d: %d\n", ks->irq, err);
                 return err;
         }
 
@@ -930,8 +921,7 @@ static int ks_net_open(struct net_device *netdev)
         ks_enable_qmu(ks);
         netif_start_queue(ks->netdev);
 
-        if (netif_msg_ifup(ks))
-                ks_dbg(ks, "network device %s up\n", netdev->name);
+        netif_dbg(ks, ifup, ks->netdev, "network device up\n");
 
         return 0;
 }
@@ -948,8 +938,7 @@ static int ks_net_stop(struct net_device *netdev)
 {
         struct ks_net *ks = netdev_priv(netdev);
 
-        if (netif_msg_ifdown(ks))
-                ks_info(ks, "%s: shutting down\n", netdev->name);
+        netif_info(ks, ifdown, netdev, "shutting down\n");
 
         netif_stop_queue(netdev);
 
@@ -1181,7 +1170,7 @@ static void ks_set_mcast(struct ks_net *ks, u16 mcast)
 static void ks_set_rx_mode(struct net_device *netdev)
 {
         struct ks_net *ks = netdev_priv(netdev);
-        struct dev_mc_list *ptr;
+        struct netdev_hw_addr *ha;
 
         /* Turn on/off promiscuous mode. */
         if ((netdev->flags & IFF_PROMISC) == IFF_PROMISC)
@@ -1198,13 +1187,12 @@ static void ks_set_rx_mode(struct net_device *netdev)
                 if (netdev_mc_count(netdev) <= MAX_MCAST_LST) {
                         int i = 0;
 
-                        netdev_for_each_mc_addr(ptr, netdev) {
-                                if (!(*ptr->dmi_addr & 1))
+                        netdev_for_each_mc_addr(ha, netdev) {
+                                if (!(*ha->addr & 1))
                                         continue;
                                 if (i >= MAX_MCAST_LST)
                                         break;
-                                memcpy(ks->mcast_lst[i++], ptr->dmi_addr,
-                                MAC_ADDR_LEN);
+                                memcpy(ks->mcast_lst[i++], ha->addr, ETH_ALEN);
                         }
                         ks->mcast_lst_size = (u8)i;
                         ks_set_grpaddr(ks);
@@ -1430,21 +1418,21 @@ static int ks_read_selftest(struct ks_net *ks)
         rd = ks_rdreg16(ks, KS_MBIR);
 
         if ((rd & both_done) != both_done) {
-                ks_warn(ks, "Memory selftest not finished\n");
+                netdev_warn(ks->netdev, "Memory selftest not finished\n");
                 return 0;
         }
 
         if (rd & MBIR_TXMBFA) {
-                ks_err(ks, "TX memory selftest fails\n");
+                netdev_err(ks->netdev, "TX memory selftest fails\n");
                 ret |= 1;
         }
 
         if (rd & MBIR_RXMBFA) {
-                ks_err(ks, "RX memory selftest fails\n");
+                netdev_err(ks->netdev, "RX memory selftest fails\n");
                 ret |= 2;
         }
 
-        ks_info(ks, "the selftest passes\n");
+        netdev_info(ks->netdev, "the selftest passes\n");
         return ret;
 }
 
@@ -1515,7 +1503,7 @@ static int ks_hw_init(struct ks_net *ks)
         ks->frame_head_info = (struct type_frame_head *) \
                 kmalloc(MHEADER_SIZE, GFP_KERNEL);
         if (!ks->frame_head_info) {
-                printk(KERN_ERR "Error: Fail to allocate frame memory\n");
+                pr_err("Error: Fail to allocate frame memory\n");
                 return false;
         }
 
@@ -1581,7 +1569,7 @@ static int __devinit ks8851_probe(struct platform_device *pdev)
         ks->mii.mdio_read       = ks_phy_read;
         ks->mii.mdio_write      = ks_phy_write;
 
-        ks_info(ks, "message enable is %d\n", msg_enable);
+        netdev_info(netdev, "message enable is %d\n", msg_enable);
         /* set the default message enable */
         ks->msg_enable = netif_msg_init(msg_enable, (NETIF_MSG_DRV |
                                                      NETIF_MSG_PROBE |
@@ -1590,13 +1578,13 @@ static int __devinit ks8851_probe(struct platform_device *pdev)
 
         /* simple check for a valid chip being connected to the bus */
         if ((ks_rdreg16(ks, KS_CIDER) & ~CIDER_REV_MASK) != CIDER_ID) {
-                ks_err(ks, "failed to read device ID\n");
+                netdev_err(netdev, "failed to read device ID\n");
                 err = -ENODEV;
                 goto err_register;
         }
 
         if (ks_read_selftest(ks)) {
-                ks_err(ks, "failed to read device ID\n");
+                netdev_err(netdev, "failed to read device ID\n");
                 err = -ENODEV;
                 goto err_register;
         }
@@ -1627,9 +1615,8 @@ static int __devinit ks8851_probe(struct platform_device *pdev)
 
         id = ks_rdreg16(ks, KS_CIDER);
 
-        printk(KERN_INFO DRV_NAME
-                " Found chip, family: 0x%x, id: 0x%x, rev: 0x%x\n",
-                (id >> 8) & 0xff, (id >> 4) & 0xf, (id >> 1) & 0x7);
+        netdev_info(netdev, "Found chip, family: 0x%x, id: 0x%x, rev: 0x%x\n",
+                    (id >> 8) & 0xff, (id >> 4) & 0xf, (id >> 1) & 0x7);
         return 0;
 
 err_register: