Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 219 insertions, 313 deletions

diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index c1b3f09f452c..084d78dd1637 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -21,6 +21,8 @@
  *
  *************************************************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define DRV_NAME        "pcnet32"
 #define DRV_VERSION     "1.35"
 #define DRV_RELDATE     "21.Apr.2008"
@@ -45,20 +47,21 @@ static const char *const version =
 #include <linux/crc32.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/if_ether.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/moduleparam.h>
 #include <linux/bitops.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
 
 #include <asm/dma.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
 #include <asm/irq.h>
 
 /*
  * PCI device identifiers for "new style" Linux PCI Device Drivers
  */
-static struct pci_device_id pcnet32_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(pcnet32_pci_tbl) = {
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME), },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE), },
 
@@ -82,7 +85,7 @@ static int cards_found;
 static unsigned int pcnet32_portlist[] __initdata =
     { 0x300, 0x320, 0x340, 0x360, 0 };
 
-static int pcnet32_debug = 0;
+static int pcnet32_debug;
 static int tx_start = 1;        /* Mapping -- 0:20, 1:64, 2:128, 3:~220 (depends on chip vers) */
 static int pcnet32vlb;          /* check for VLB cards ? */
 
@@ -389,7 +392,7 @@ static struct pcnet32_access pcnet32_wio = {
 static u16 pcnet32_dwio_read_csr(unsigned long addr, int index)
 {
         outl(index, addr + PCNET32_DWIO_RAP);
-        return (inl(addr + PCNET32_DWIO_RDP) & 0xffff);
+        return inl(addr + PCNET32_DWIO_RDP) & 0xffff;
 }
 
 static void pcnet32_dwio_write_csr(unsigned long addr, int index, u16 val)
@@ -401,7 +404,7 @@ static void pcnet32_dwio_write_csr(unsigned long addr, int index, u16 val)
 static u16 pcnet32_dwio_read_bcr(unsigned long addr, int index)
 {
         outl(index, addr + PCNET32_DWIO_RAP);
-        return (inl(addr + PCNET32_DWIO_BDP) & 0xffff);
+        return inl(addr + PCNET32_DWIO_BDP) & 0xffff;
 }
 
 static void pcnet32_dwio_write_bcr(unsigned long addr, int index, u16 val)
@@ -412,7 +415,7 @@ static void pcnet32_dwio_write_bcr(unsigned long addr, int index, u16 val)
 
 static u16 pcnet32_dwio_read_rap(unsigned long addr)
 {
-        return (inl(addr + PCNET32_DWIO_RAP) & 0xffff);
+        return inl(addr + PCNET32_DWIO_RAP) & 0xffff;
 }
 
 static void pcnet32_dwio_write_rap(unsigned long addr, u16 val)
@@ -486,10 +489,7 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev,
                                            (1 << size),
                                            &new_ring_dma_addr);
         if (new_tx_ring == NULL) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR
-                               "%s: Consistent memory allocation failed.\n",
-                               dev->name);
+                netif_err(lp, drv, dev, "Consistent memory allocation failed\n");
                 return;
         }
         memset(new_tx_ring, 0, sizeof(struct pcnet32_tx_head) * (1 << size));
@@ -497,18 +497,14 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev,
         new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t),
                                 GFP_ATOMIC);
         if (!new_dma_addr_list) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR
-                               "%s: Memory allocation failed.\n", dev->name);
+                netif_err(lp, drv, dev, "Memory allocation failed\n");
                 goto free_new_tx_ring;
         }
 
         new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *),
                                 GFP_ATOMIC);
         if (!new_skb_list) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR
-                               "%s: Memory allocation failed.\n", dev->name);
+                netif_err(lp, drv, dev, "Memory allocation failed\n");
                 goto free_new_lists;
         }
 
@@ -528,15 +524,14 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev,
         lp->tx_skbuff = new_skb_list;
         return;
 
-    free_new_lists:
+free_new_lists:
         kfree(new_dma_addr_list);
-    free_new_tx_ring:
+free_new_tx_ring:
         pci_free_consistent(lp->pci_dev,
                             sizeof(struct pcnet32_tx_head) *
                             (1 << size),
                             new_tx_ring,
                             new_ring_dma_addr);
-        return;
 }
 
 /*
@@ -564,10 +559,7 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
                                            (1 << size),
                                            &new_ring_dma_addr);
         if (new_rx_ring == NULL) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR
-                               "%s: Consistent memory allocation failed.\n",
-                               dev->name);
+                netif_err(lp, drv, dev, "Consistent memory allocation failed\n");
                 return;
         }
         memset(new_rx_ring, 0, sizeof(struct pcnet32_rx_head) * (1 << size));
@@ -575,18 +567,14 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
         new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t),
                                 GFP_ATOMIC);
         if (!new_dma_addr_list) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR
-                               "%s: Memory allocation failed.\n", dev->name);
+                netif_err(lp, drv, dev, "Memory allocation failed\n");
                 goto free_new_rx_ring;
         }
 
         new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *),
                                 GFP_ATOMIC);
         if (!new_skb_list) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR
-                               "%s: Memory allocation failed.\n", dev->name);
+                netif_err(lp, drv, dev, "Memory allocation failed\n");
                 goto free_new_lists;
         }
 
@@ -598,15 +586,14 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
                 new_skb_list[new] = lp->rx_skbuff[new];
         }
         /* now allocate any new buffers needed */
-        for (; new < size; new++ ) {
+        for (; new < size; new++) {
                 struct sk_buff *rx_skbuff;
                 new_skb_list[new] = dev_alloc_skb(PKT_BUF_SKB);
-                if (!(rx_skbuff = new_skb_list[new])) {
+                rx_skbuff = new_skb_list[new];
+                if (!rx_skbuff) {
                         /* keep the original lists and buffers */
-                        if (netif_msg_drv(lp))
-                                printk(KERN_ERR
-                                       "%s: pcnet32_realloc_rx_ring dev_alloc_skb failed.\n",
-                                       dev->name);
+                        netif_err(lp, drv, dev, "%s dev_alloc_skb failed\n",
+                                  __func__);
                         goto free_all_new;
                 }
                 skb_reserve(rx_skbuff, NET_IP_ALIGN);
@@ -643,8 +630,8 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
         lp->rx_skbuff = new_skb_list;
         return;
 
-    free_all_new:
-        for (; --new >= lp->rx_ring_size; ) {
+free_all_new:
+        while (--new >= lp->rx_ring_size) {
                 if (new_skb_list[new]) {
                         pci_unmap_single(lp->pci_dev, new_dma_addr_list[new],
                                          PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
@@ -652,9 +639,9 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
                 }
         }
         kfree(new_skb_list);
-    free_new_lists:
+free_new_lists:
         kfree(new_dma_addr_list);
-    free_new_rx_ring:
+free_new_rx_ring:
         pci_free_consistent(lp->pci_dev,
                             sizeof(struct pcnet32_rx_head) *
                             (1 << size),
@@ -837,16 +824,14 @@ static int pcnet32_set_ringparam(struct net_device *dev,
 
         spin_unlock_irqrestore(&lp->lock, flags);
 
-        if (netif_msg_drv(lp))
-                printk(KERN_INFO
-                       "%s: Ring Param Settings: RX: %d, TX: %d\n", dev->name,
-                       lp->rx_ring_size, lp->tx_ring_size);
+        netif_info(lp, drv, dev, "Ring Param Settings: RX: %d, TX: %d\n",
+                   lp->rx_ring_size, lp->tx_ring_size);
 
         return 0;
 }
 
 static void pcnet32_get_strings(struct net_device *dev, u32 stringset,
-                                u8 * data)
+                                u8 *data)
 {
         memcpy(data, pcnet32_gstrings_test, sizeof(pcnet32_gstrings_test));
 }
@@ -870,17 +855,15 @@ static void pcnet32_ethtool_test(struct net_device *dev,
         if (test->flags == ETH_TEST_FL_OFFLINE) {
                 rc = pcnet32_loopback_test(dev, data);
                 if (rc) {
-                        if (netif_msg_hw(lp))
-                                printk(KERN_DEBUG "%s: Loopback test failed.\n",
-                                       dev->name);
+                        netif_printk(lp, hw, KERN_DEBUG, dev,
+                                     "Loopback test failed\n");
                         test->flags |= ETH_TEST_FL_FAILED;
-                } else if (netif_msg_hw(lp))
-                        printk(KERN_DEBUG "%s: Loopback test passed.\n",
-                               dev->name);
-        } else if (netif_msg_hw(lp))
-                printk(KERN_DEBUG
-                       "%s: No tests to run (specify 'Offline' on ethtool).",
-                       dev->name);
+                } else
+                        netif_printk(lp, hw, KERN_DEBUG, dev,
+                                     "Loopback test passed\n");
+        } else
+                netif_printk(lp, hw, KERN_DEBUG, dev,
+                             "No tests to run (specify 'Offline' on ethtool)\n");
 }                               /* end pcnet32_ethtool_test */
 
 static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
@@ -925,40 +908,39 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
         /* Initialize Transmit buffers. */
         size = data_len + 15;
         for (x = 0; x < numbuffs; x++) {
-                if (!(skb = dev_alloc_skb(size))) {
-                        if (netif_msg_hw(lp))
-                                printk(KERN_DEBUG
-                                       "%s: Cannot allocate skb at line: %d!\n",
-                                       dev->name, __LINE__);
+                skb = dev_alloc_skb(size);
+                if (!skb) {
+                        netif_printk(lp, hw, KERN_DEBUG, dev,
+                                     "Cannot allocate skb at line: %d!\n",
+                                     __LINE__);
                         goto clean_up;
-                } else {
-                        packet = skb->data;
-                        skb_put(skb, size);     /* create space for data */
-                        lp->tx_skbuff[x] = skb;
-                        lp->tx_ring[x].length = cpu_to_le16(-skb->len);
-                        lp->tx_ring[x].misc = 0;
-
-                        /* put DA and SA into the skb */
-                        for (i = 0; i < 6; i++)
-                                *packet++ = dev->dev_addr[i];
-                        for (i = 0; i < 6; i++)
-                                *packet++ = dev->dev_addr[i];
-                        /* type */
-                        *packet++ = 0x08;
-                        *packet++ = 0x06;
-                        /* packet number */
-                        *packet++ = x;
-                        /* fill packet with data */
-                        for (i = 0; i < data_len; i++)
-                                *packet++ = i;
-
-                        lp->tx_dma_addr[x] =
-                            pci_map_single(lp->pci_dev, skb->data, skb->len,
-                                           PCI_DMA_TODEVICE);
-                        lp->tx_ring[x].base = cpu_to_le32(lp->tx_dma_addr[x]);
-                        wmb();  /* Make sure owner changes after all others are visible */
-                        lp->tx_ring[x].status = cpu_to_le16(status);
                 }
+                packet = skb->data;
+                skb_put(skb, size);     /* create space for data */
+                lp->tx_skbuff[x] = skb;
+                lp->tx_ring[x].length = cpu_to_le16(-skb->len);
+                lp->tx_ring[x].misc = 0;
+
+                /* put DA and SA into the skb */
+                for (i = 0; i < 6; i++)
+                        *packet++ = dev->dev_addr[i];
+                for (i = 0; i < 6; i++)
+                        *packet++ = dev->dev_addr[i];
+                /* type */
+                *packet++ = 0x08;
+                *packet++ = 0x06;
+                /* packet number */
+                *packet++ = x;
+                /* fill packet with data */
+                for (i = 0; i < data_len; i++)
+                        *packet++ = i;
+
+                lp->tx_dma_addr[x] =
+                        pci_map_single(lp->pci_dev, skb->data, skb->len,
+                                       PCI_DMA_TODEVICE);
+                lp->tx_ring[x].base = cpu_to_le32(lp->tx_dma_addr[x]);
+                wmb();  /* Make sure owner changes after all others are visible */
+                lp->tx_ring[x].status = cpu_to_le16(status);
         }
 
         x = a->read_bcr(ioaddr, 32);    /* set internal loopback in BCR32 */
@@ -983,9 +965,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
                         ticks++;
                 }
                 if (ticks == 200) {
-                        if (netif_msg_hw(lp))
-                                printk("%s: Desc %d failed to reset!\n",
-                                       dev->name, x);
+                        netif_err(lp, hw, dev, "Desc %d failed to reset!\n", x);
                         break;
                 }
         }
@@ -993,15 +973,14 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
         lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* Set STOP bit */
         wmb();
         if (netif_msg_hw(lp) && netif_msg_pktdata(lp)) {
-                printk(KERN_DEBUG "%s: RX loopback packets:\n", dev->name);
+                netdev_printk(KERN_DEBUG, dev, "RX loopback packets:\n");
 
                 for (x = 0; x < numbuffs; x++) {
-                        printk(KERN_DEBUG "%s: Packet %d:\n", dev->name, x);
+                        netdev_printk(KERN_DEBUG, dev, "Packet %d: ", x);
                         skb = lp->rx_skbuff[x];
-                        for (i = 0; i < size; i++) {
-                                printk("%02x ", *(skb->data + i));
-                        }
-                        printk("\n");
+                        for (i = 0; i < size; i++)
+                                pr_cont(" %02x", *(skb->data + i));
+                        pr_cont("\n");
                 }
         }
 
@@ -1012,11 +991,9 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
                 packet = lp->tx_skbuff[x]->data;
                 for (i = 0; i < size; i++) {
                         if (*(skb->data + i) != packet[i]) {
-                                if (netif_msg_hw(lp))
-                                        printk(KERN_DEBUG
-                                               "%s: Error in compare! %2x - %02x %02x\n",
-                                               dev->name, i, *(skb->data + i),
-                                               packet[i]);
+                                netif_printk(lp, hw, KERN_DEBUG, dev,
+                                             "Error in compare! %2x - %02x %02x\n",
+                                             i, *(skb->data + i), packet[i]);
                                 rc = 1;
                                 break;
                         }
@@ -1024,7 +1001,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
                 x++;
         }
 
-      clean_up:
+clean_up:
         *data1 = rc;
         pcnet32_purge_tx_ring(dev);
 
@@ -1043,7 +1020,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
         }
         spin_unlock_irqrestore(&lp->lock, flags);
 
-        return (rc);
+        return rc;
 }                               /* end pcnet32_loopback_test  */
 
 static void pcnet32_led_blink_callback(struct net_device *dev)
@@ -1055,9 +1032,8 @@ static void pcnet32_led_blink_callback(struct net_device *dev)
         int i;
 
         spin_lock_irqsave(&lp->lock, flags);
-        for (i = 4; i < 8; i++) {
+        for (i = 4; i < 8; i++)
                 a->write_bcr(ioaddr, i, a->read_bcr(ioaddr, i) ^ 0x4000);
-        }
         spin_unlock_irqrestore(&lp->lock, flags);
 
         mod_timer(&lp->blink_timer, PCNET32_BLINK_TIMEOUT);
@@ -1079,9 +1055,8 @@ static int pcnet32_phys_id(struct net_device *dev, u32 data)
 
         /* Save the current value of the bcrs */
         spin_lock_irqsave(&lp->lock, flags);
-        for (i = 4; i < 8; i++) {
+        for (i = 4; i < 8; i++)
                 regs[i - 4] = a->read_bcr(ioaddr, i);
-        }
         spin_unlock_irqrestore(&lp->lock, flags);
 
         mod_timer(&lp->blink_timer, jiffies);
@@ -1096,9 +1071,8 @@ static int pcnet32_phys_id(struct net_device *dev, u32 data)
 
         /* Restore the original value of the bcrs */
         spin_lock_irqsave(&lp->lock, flags);
-        for (i = 4; i < 8; i++) {
+        for (i = 4; i < 8; i++)
                 a->write_bcr(ioaddr, i, regs[i - 4]);
-        }
         spin_unlock_irqrestore(&lp->lock, flags);
 
         return 0;
@@ -1135,10 +1109,8 @@ static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,
                 spin_lock_irqsave(&lp->lock, *flags);
                 ticks++;
                 if (ticks > 200) {
-                        if (netif_msg_hw(lp))
-                                printk(KERN_DEBUG
-                                       "%s: Error getting into suspend!\n",
-                                       dev->name);
+                        netif_printk(lp, hw, KERN_DEBUG, dev,
+                                     "Error getting into suspend!\n");
                         return 0;
                 }
         }
@@ -1183,15 +1155,13 @@ static void pcnet32_rx_entry(struct net_device *dev,
 
         /* Discard oversize frames. */
         if (unlikely(pkt_len > PKT_BUF_SIZE)) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR "%s: Impossible packet size %d!\n",
-                               dev->name, pkt_len);
+                netif_err(lp, drv, dev, "Impossible packet size %d!\n",
+                          pkt_len);
                 dev->stats.rx_errors++;
                 return;
         }
         if (pkt_len < 60) {
-                if (netif_msg_rx_err(lp))
-                        printk(KERN_ERR "%s: Runt packet!\n", dev->name);
+                netif_err(lp, rx_err, dev, "Runt packet!\n");
                 dev->stats.rx_errors++;
                 return;
         }
@@ -1199,7 +1169,8 @@ static void pcnet32_rx_entry(struct net_device *dev,
         if (pkt_len > rx_copybreak) {
                 struct sk_buff *newskb;
 
-                if ((newskb = dev_alloc_skb(PKT_BUF_SKB))) {
+                newskb = dev_alloc_skb(PKT_BUF_SKB);
+                if (newskb) {
                         skb_reserve(newskb, NET_IP_ALIGN);
                         skb = lp->rx_skbuff[entry];
                         pci_unmap_single(lp->pci_dev,
@@ -1217,15 +1188,11 @@ static void pcnet32_rx_entry(struct net_device *dev,
                         rx_in_place = 1;
                 } else
                         skb = NULL;
-        } else {
+        } else
                 skb = dev_alloc_skb(pkt_len + NET_IP_ALIGN);
-        }
 
         if (skb == NULL) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR
-                               "%s: Memory squeeze, dropping packet.\n",
-                               dev->name);
+                netif_err(lp, drv, dev, "Memory squeeze, dropping packet\n");
                 dev->stats.rx_dropped++;
                 return;
         }
@@ -1296,11 +1263,9 @@ static int pcnet32_tx(struct net_device *dev)
                         /* There was a major error, log it. */
                         int err_status = le32_to_cpu(lp->tx_ring[entry].misc);
                         dev->stats.tx_errors++;
-                        if (netif_msg_tx_err(lp))
-                                printk(KERN_ERR
-                                       "%s: Tx error status=%04x err_status=%08x\n",
-                                       dev->name, status,
-                                       err_status);
+                        netif_err(lp, tx_err, dev,
+                                  "Tx error status=%04x err_status=%08x\n",
+                                  status, err_status);
                         if (err_status & 0x04000000)
                                 dev->stats.tx_aborted_errors++;
                         if (err_status & 0x08000000)
@@ -1312,10 +1277,7 @@ static int pcnet32_tx(struct net_device *dev)
                                 dev->stats.tx_fifo_errors++;
                                 /* Ackk!  On FIFO errors the Tx unit is turned off! */
                                 /* Remove this verbosity later! */
-                                if (netif_msg_tx_err(lp))
-                                        printk(KERN_ERR
-                                               "%s: Tx FIFO error!\n",
-                                               dev->name);
+                                netif_err(lp, tx_err, dev, "Tx FIFO error!\n");
                                 must_restart = 1;
                         }
 #else
@@ -1324,10 +1286,7 @@ static int pcnet32_tx(struct net_device *dev)
                                 if (!lp->dxsuflo) {     /* If controller doesn't recover ... */
                                         /* Ackk!  On FIFO errors the Tx unit is turned off! */
                                         /* Remove this verbosity later! */
-                                        if (netif_msg_tx_err(lp))
-                                                printk(KERN_ERR
-                                                       "%s: Tx FIFO error!\n",
-                                                       dev->name);
+                                        netif_err(lp, tx_err, dev, "Tx FIFO error!\n");
                                         must_restart = 1;
                                 }
                         }
@@ -1353,11 +1312,8 @@ static int pcnet32_tx(struct net_device *dev)
 
         delta = (lp->cur_tx - dirty_tx) & (lp->tx_mod_mask + lp->tx_ring_size);
         if (delta > lp->tx_ring_size) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR
-                               "%s: out-of-sync dirty pointer, %d vs. %d, full=%d.\n",
-                               dev->name, dirty_tx, lp->cur_tx,
-                               lp->tx_full);
+                netif_err(lp, drv, dev, "out-of-sync dirty pointer, %d vs. %d, full=%d\n",
+                          dirty_tx, lp->cur_tx, lp->tx_full);
                 dirty_tx += lp->tx_ring_size;
                 delta -= lp->tx_ring_size;
         }
@@ -1420,7 +1376,7 @@ static int pcnet32_get_regs_len(struct net_device *dev)
         struct pcnet32_private *lp = netdev_priv(dev);
         int j = lp->phycount * PCNET32_REGS_PER_PHY;
 
-        return ((PCNET32_NUM_REGS + j) * sizeof(u16));
+        return (PCNET32_NUM_REGS + j) * sizeof(u16);
 }
 
 static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
@@ -1444,21 +1400,20 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
                 *buff++ = inw(ioaddr + i);
 
         /* read control and status registers */
-        for (i = 0; i < 90; i++) {
+        for (i = 0; i < 90; i++)
                 *buff++ = a->read_csr(ioaddr, i);
-        }
 
         *buff++ = a->read_csr(ioaddr, 112);
         *buff++ = a->read_csr(ioaddr, 114);
 
         /* read bus configuration registers */
-        for (i = 0; i < 30; i++) {
+        for (i = 0; i < 30; i++)
                 *buff++ = a->read_bcr(ioaddr, i);
-        }
+
         *buff++ = 0;            /* skip bcr30 so as not to hang 79C976 */
-        for (i = 31; i < 36; i++) {
+
+        for (i = 31; i < 36; i++)
                 *buff++ = a->read_bcr(ioaddr, i);
-        }
 
         /* read mii phy registers */
         if (lp->mii) {
@@ -1515,8 +1470,8 @@ static void __devinit pcnet32_probe_vlbus(unsigned int *pcnet32_portlist)
                 if (request_region
                     (ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_vlbus")) {
                         /* check if there is really a pcnet chip on that ioaddr */
-                        if ((inb(ioaddr + 14) == 0x57)
-                            && (inb(ioaddr + 15) == 0x57)) {
+                        if ((inb(ioaddr + 14) == 0x57) &&
+                            (inb(ioaddr + 15) == 0x57)) {
                                 pcnet32_probe1(ioaddr, 0, NULL);
                         } else {
                                 release_region(ioaddr, PCNET32_TOTAL_SIZE);
@@ -1534,8 +1489,7 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
         err = pci_enable_device(pdev);
         if (err < 0) {
                 if (pcnet32_debug & NETIF_MSG_PROBE)
-                        printk(KERN_ERR PFX
-                               "failed to enable device -- err=%d\n", err);
+                        pr_err("failed to enable device -- err=%d\n", err);
                 return err;
         }
         pci_set_master(pdev);
@@ -1543,29 +1497,25 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
         ioaddr = pci_resource_start(pdev, 0);
         if (!ioaddr) {
                 if (pcnet32_debug & NETIF_MSG_PROBE)
-                        printk(KERN_ERR PFX
-                               "card has no PCI IO resources, aborting\n");
+                        pr_err("card has no PCI IO resources, aborting\n");
                 return -ENODEV;
         }
 
         if (!pci_dma_supported(pdev, PCNET32_DMA_MASK)) {
                 if (pcnet32_debug & NETIF_MSG_PROBE)
-                        printk(KERN_ERR PFX
-                               "architecture does not support 32bit PCI busmaster DMA\n");
+                        pr_err("architecture does not support 32bit PCI busmaster DMA\n");
                 return -ENODEV;
         }
-        if (request_region(ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_pci") ==
-            NULL) {
+        if (!request_region(ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_pci")) {
                 if (pcnet32_debug & NETIF_MSG_PROBE)
-                        printk(KERN_ERR PFX
-                               "io address range already allocated\n");
+                        pr_err("io address range already allocated\n");
                 return -EBUSY;
         }
 
         err = pcnet32_probe1(ioaddr, 1, pdev);
-        if (err < 0) {
+        if (err < 0)
                 pci_disable_device(pdev);
-        }
+
         return err;
 }
 
@@ -1610,12 +1560,12 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                 a = &pcnet32_wio;
         } else {
                 pcnet32_dwio_reset(ioaddr);
-                if (pcnet32_dwio_read_csr(ioaddr, 0) == 4
-                    && pcnet32_dwio_check(ioaddr)) {
+                if (pcnet32_dwio_read_csr(ioaddr, 0) == 4 &&
+                    pcnet32_dwio_check(ioaddr)) {
                         a = &pcnet32_dwio;
                 } else {
                         if (pcnet32_debug & NETIF_MSG_PROBE)
-                                printk(KERN_ERR PFX "No access methods\n");
+                                pr_err("No access methods\n");
                         goto err_release_region;
                 }
         }
@@ -1623,11 +1573,10 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
         chip_version =
             a->read_csr(ioaddr, 88) | (a->read_csr(ioaddr, 89) << 16);
         if ((pcnet32_debug & NETIF_MSG_PROBE) && (pcnet32_debug & NETIF_MSG_HW))
-                printk(KERN_INFO "  PCnet chip version is %#x.\n",
-                       chip_version);
+                pr_info("  PCnet chip version is %#x\n", chip_version);
         if ((chip_version & 0xfff) != 0x003) {
                 if (pcnet32_debug & NETIF_MSG_PROBE)
-                        printk(KERN_INFO PFX "Unsupported chip version.\n");
+                        pr_info("Unsupported chip version\n");
                 goto err_release_region;
         }
 
@@ -1680,7 +1629,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                 if (cards_found < MAX_UNITS && homepna[cards_found])
                         media |= 1;     /* switch to home wiring mode */
                 if (pcnet32_debug & NETIF_MSG_PROBE)
-                        printk(KERN_DEBUG PFX "media set to %sMbit mode.\n",
+                        printk(KERN_DEBUG PFX "media set to %sMbit mode\n",
                                (media & 1) ? "1" : "10");
                 a->write_bcr(ioaddr, 49, media);
                 break;
@@ -1696,9 +1645,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                 break;
         default:
                 if (pcnet32_debug & NETIF_MSG_PROBE)
-                        printk(KERN_INFO PFX
-                               "PCnet version %#x, no PCnet32 chip.\n",
-                               chip_version);
+                        pr_info("PCnet version %#x, no PCnet32 chip\n",
+                                chip_version);
                 goto err_release_region;
         }
 
@@ -1720,7 +1668,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
         dev = alloc_etherdev(sizeof(*lp));
         if (!dev) {
                 if (pcnet32_debug & NETIF_MSG_PROBE)
-                        printk(KERN_ERR PFX "Memory allocation failed.\n");
+                        pr_err("Memory allocation failed\n");
                 ret = -ENOMEM;
                 goto err_release_region;
         }
@@ -1729,7 +1677,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                 SET_NETDEV_DEV(dev, &pdev->dev);
 
         if (pcnet32_debug & NETIF_MSG_PROBE)
-                printk(KERN_INFO PFX "%s at %#3lx,", chipname, ioaddr);
+                pr_info("%s at %#3lx,", chipname, ioaddr);
 
         /* In most chips, after a chip reset, the ethernet address is read from the
          * station address PROM at the base address and programmed into the
@@ -1750,13 +1698,12 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
         for (i = 0; i < 6; i++)
                 promaddr[i] = inb(ioaddr + i);
 
-        if (memcmp(promaddr, dev->dev_addr, 6)
-            || !is_valid_ether_addr(dev->dev_addr)) {
+        if (memcmp(promaddr, dev->dev_addr, 6) ||
+            !is_valid_ether_addr(dev->dev_addr)) {
                 if (is_valid_ether_addr(promaddr)) {
                         if (pcnet32_debug & NETIF_MSG_PROBE) {
-                                printk(" warning: CSR address invalid,\n");
-                                printk(KERN_INFO
-                                       "    using instead PROM address of");
+                                pr_cont(" warning: CSR address invalid,\n");
+                                pr_info("    using instead PROM address of");
                         }
                         memcpy(dev->dev_addr, promaddr, 6);
                 }
@@ -1765,57 +1712,57 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
 
         /* if the ethernet address is not valid, force to 00:00:00:00:00:00 */
         if (!is_valid_ether_addr(dev->perm_addr))
-                memset(dev->dev_addr, 0, sizeof(dev->dev_addr));
+                memset(dev->dev_addr, 0, ETH_ALEN);
 
         if (pcnet32_debug & NETIF_MSG_PROBE) {
-                printk(" %pM", dev->dev_addr);
+                pr_cont(" %pM", dev->dev_addr);
 
                 /* Version 0x2623 and 0x2624 */
                 if (((chip_version + 1) & 0xfffe) == 0x2624) {
                         i = a->read_csr(ioaddr, 80) & 0x0C00;   /* Check tx_start_pt */
-                        printk(KERN_INFO "    tx_start_pt(0x%04x):", i);
+                        pr_info("    tx_start_pt(0x%04x):", i);
                         switch (i >> 10) {
                         case 0:
-                                printk(KERN_CONT "  20 bytes,");
+                                pr_cont("  20 bytes,");
                                 break;
                         case 1:
-                                printk(KERN_CONT "  64 bytes,");
+                                pr_cont("  64 bytes,");
                                 break;
                         case 2:
-                                printk(KERN_CONT " 128 bytes,");
+                                pr_cont(" 128 bytes,");
                                 break;
                         case 3:
-                                printk(KERN_CONT "~220 bytes,");
+                                pr_cont("~220 bytes,");
                                 break;
                         }
                         i = a->read_bcr(ioaddr, 18);    /* Check Burst/Bus control */
-                        printk(KERN_CONT " BCR18(%x):", i & 0xffff);
+                        pr_cont(" BCR18(%x):", i & 0xffff);
                         if (i & (1 << 5))
-                                printk(KERN_CONT "BurstWrEn ");
+                                pr_cont("BurstWrEn ");
                         if (i & (1 << 6))
-                                printk(KERN_CONT "BurstRdEn ");
+                                pr_cont("BurstRdEn ");
                         if (i & (1 << 7))
-                                printk(KERN_CONT "DWordIO ");
+                                pr_cont("DWordIO ");
                         if (i & (1 << 11))
-                                printk(KERN_CONT "NoUFlow ");
+                                pr_cont("NoUFlow ");
                         i = a->read_bcr(ioaddr, 25);
-                        printk(KERN_INFO "    SRAMSIZE=0x%04x,", i << 8);
+                        pr_info("    SRAMSIZE=0x%04x,", i << 8);
                         i = a->read_bcr(ioaddr, 26);
-                        printk(KERN_CONT " SRAM_BND=0x%04x,", i << 8);
+                        pr_cont(" SRAM_BND=0x%04x,", i << 8);
                         i = a->read_bcr(ioaddr, 27);
                         if (i & (1 << 14))
-                                printk(KERN_CONT "LowLatRx");
+                                pr_cont("LowLatRx");
                 }
         }
 
         dev->base_addr = ioaddr;
         lp = netdev_priv(dev);
         /* pci_alloc_consistent returns page-aligned memory, so we do not have to check the alignment */
-        if ((lp->init_block =
-             pci_alloc_consistent(pdev, sizeof(*lp->init_block), &lp->init_dma_addr)) == NULL) {
+        lp->init_block = pci_alloc_consistent(pdev, sizeof(*lp->init_block),
+                                              &lp->init_dma_addr);
+        if (!lp->init_block) {
                 if (pcnet32_debug & NETIF_MSG_PROBE)
-                        printk(KERN_ERR PFX
-                               "Consistent memory allocation failed.\n");
+                        pr_err("Consistent memory allocation failed\n");
                 ret = -ENOMEM;
                 goto err_free_netdev;
         }
@@ -1840,8 +1787,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
         lp->mii = mii;
         lp->chip_version = chip_version;
         lp->msg_enable = pcnet32_debug;
-        if ((cards_found >= MAX_UNITS)
-            || (options[cards_found] >= sizeof(options_mapping)))
+        if ((cards_found >= MAX_UNITS) ||
+            (options[cards_found] >= sizeof(options_mapping)))
                 lp->options = PCNET32_PORT_ASEL;
         else
                 lp->options = options_mapping[options[cards_found]];
@@ -1866,8 +1813,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                 goto err_free_ring;
         }
         /* detect special T1/E1 WAN card by checking for MAC address */
-        if (dev->dev_addr[0] == 0x00 && dev->dev_addr[1] == 0xe0
-            && dev->dev_addr[2] == 0x75)
+        if (dev->dev_addr[0] == 0x00 && dev->dev_addr[1] == 0xe0 &&
+            dev->dev_addr[2] == 0x75)
                 lp->options = PCNET32_PORT_FD | PCNET32_PORT_GPSI;
 
         lp->init_block->mode = cpu_to_le16(0x0003);     /* Disable Rx and Tx. */
@@ -1889,7 +1836,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
         if (pdev) {             /* use the IRQ provided by PCI */
                 dev->irq = pdev->irq;
                 if (pcnet32_debug & NETIF_MSG_PROBE)
-                        printk(" assigned IRQ %d.\n", dev->irq);
+                        pr_cont(" assigned IRQ %d\n", dev->irq);
         } else {
                 unsigned long irq_mask = probe_irq_on();
 
@@ -1905,12 +1852,12 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                 dev->irq = probe_irq_off(irq_mask);
                 if (!dev->irq) {
                         if (pcnet32_debug & NETIF_MSG_PROBE)
-                                printk(", failed to detect IRQ line.\n");
+                                pr_cont(", failed to detect IRQ line\n");
                         ret = -ENODEV;
                         goto err_free_ring;
                 }
                 if (pcnet32_debug & NETIF_MSG_PROBE)
-                        printk(", probed IRQ %d.\n", dev->irq);
+                        pr_cont(", probed IRQ %d\n", dev->irq);
         }
 
         /* Set the mii phy_id so that we can query the link state */
@@ -1934,14 +1881,12 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                         lp->phymask |= (1 << i);
                         lp->mii_if.phy_id = i;
                         if (pcnet32_debug & NETIF_MSG_PROBE)
-                                printk(KERN_INFO PFX
-                                       "Found PHY %04x:%04x at address %d.\n",
-                                       id1, id2, i);
+                                pr_info("Found PHY %04x:%04x at address %d\n",
+                                        id1, id2, i);
                 }
                 lp->a.write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
-                if (lp->phycount > 1) {
+                if (lp->phycount > 1)
                         lp->options |= PCNET32_PORT_MII;
-                }
         }
 
         init_timer(&lp->watchdog_timer);
@@ -1965,7 +1910,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
         }
 
         if (pcnet32_debug & NETIF_MSG_PROBE)
-                printk(KERN_INFO "%s: registered as %s\n", dev->name, lp->name);
+                pr_info("%s: registered as %s\n", dev->name, lp->name);
         cards_found++;
 
         /* enable LED writes */
@@ -1994,10 +1939,7 @@ static int pcnet32_alloc_ring(struct net_device *dev, const char *name)
                                            lp->tx_ring_size,
                                            &lp->tx_ring_dma_addr);
         if (lp->tx_ring == NULL) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR PFX
-                               "%s: Consistent memory allocation failed.\n",
-                               name);
+                netif_err(lp, drv, dev, "Consistent memory allocation failed\n");
                 return -ENOMEM;
         }
 
@@ -2006,46 +1948,35 @@ static int pcnet32_alloc_ring(struct net_device *dev, const char *name)
                                            lp->rx_ring_size,
                                            &lp->rx_ring_dma_addr);
         if (lp->rx_ring == NULL) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR PFX
-                               "%s: Consistent memory allocation failed.\n",
-                               name);
+                netif_err(lp, drv, dev, "Consistent memory allocation failed\n");
                 return -ENOMEM;
         }
 
         lp->tx_dma_addr = kcalloc(lp->tx_ring_size, sizeof(dma_addr_t),
                                   GFP_ATOMIC);
         if (!lp->tx_dma_addr) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR PFX
-                               "%s: Memory allocation failed.\n", name);
+                netif_err(lp, drv, dev, "Memory allocation failed\n");
                 return -ENOMEM;
         }
 
         lp->rx_dma_addr = kcalloc(lp->rx_ring_size, sizeof(dma_addr_t),
                                   GFP_ATOMIC);
         if (!lp->rx_dma_addr) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR PFX
-                               "%s: Memory allocation failed.\n", name);
+                netif_err(lp, drv, dev, "Memory allocation failed\n");
                 return -ENOMEM;
         }
 
         lp->tx_skbuff = kcalloc(lp->tx_ring_size, sizeof(struct sk_buff *),
                                 GFP_ATOMIC);
         if (!lp->tx_skbuff) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR PFX
-                               "%s: Memory allocation failed.\n", name);
+                netif_err(lp, drv, dev, "Memory allocation failed\n");
                 return -ENOMEM;
         }
 
         lp->rx_skbuff = kcalloc(lp->rx_ring_size, sizeof(struct sk_buff *),
                                 GFP_ATOMIC);
         if (!lp->rx_skbuff) {
-                if (netif_msg_drv(lp))
-                        printk(KERN_ERR PFX
-                               "%s: Memory allocation failed.\n", name);
+                netif_err(lp, drv, dev, "Memory allocation failed\n");
                 return -ENOMEM;
         }
 
@@ -2095,7 +2026,7 @@ static int pcnet32_open(struct net_device *dev)
         int rc;
         unsigned long flags;
 
-        if (request_irq(dev->irq, &pcnet32_interrupt,
+        if (request_irq(dev->irq, pcnet32_interrupt,
                         lp->shared_irq ? IRQF_SHARED : 0, dev->name,
                         (void *)dev)) {
                 return -EAGAIN;
@@ -2114,12 +2045,11 @@ static int pcnet32_open(struct net_device *dev)
         /* switch pcnet32 to 32bit mode */
         lp->a.write_bcr(ioaddr, 20, 2);
 
-        if (netif_msg_ifup(lp))
-                printk(KERN_DEBUG
-                       "%s: pcnet32_open() irq %d tx/rx rings %#x/%#x init %#x.\n",
-                       dev->name, dev->irq, (u32) (lp->tx_ring_dma_addr),
-                       (u32) (lp->rx_ring_dma_addr),
-                       (u32) (lp->init_dma_addr));
+        netif_printk(lp, ifup, KERN_DEBUG, dev,
+                     "%s() irq %d tx/rx rings %#x/%#x init %#x\n",
+                     __func__, dev->irq, (u32) (lp->tx_ring_dma_addr),
+                     (u32) (lp->rx_ring_dma_addr),
+                     (u32) (lp->init_dma_addr));
 
         /* set/reset autoselect bit */
         val = lp->a.read_bcr(ioaddr, 2) & ~2;
@@ -2154,10 +2084,8 @@ static int pcnet32_open(struct net_device *dev)
              pdev->subsystem_device == PCI_SUBDEVICE_ID_AT_2701FX)) {
                 if (lp->options & PCNET32_PORT_ASEL) {
                         lp->options = PCNET32_PORT_FD | PCNET32_PORT_100;
-                        if (netif_msg_link(lp))
-                                printk(KERN_DEBUG
-                                       "%s: Setting 100Mb-Full Duplex.\n",
-                                       dev->name);
+                        netif_printk(lp, link, KERN_DEBUG, dev,
+                                     "Setting 100Mb-Full Duplex\n");
                 }
         }
         if (lp->phycount < 2) {
@@ -2245,9 +2173,7 @@ static int pcnet32_open(struct net_device *dev)
                         }
                 }
                 lp->mii_if.phy_id = first_phy;
-                if (netif_msg_link(lp))
-                        printk(KERN_INFO "%s: Using PHY number %d.\n",
-                               dev->name, first_phy);
+                netif_info(lp, link, dev, "Using PHY number %d\n", first_phy);
         }
 
 #ifdef DO_DXSUFLO
@@ -2294,18 +2220,17 @@ static int pcnet32_open(struct net_device *dev)
          */
         lp->a.write_csr(ioaddr, CSR0, CSR0_NORMAL);
 
-        if (netif_msg_ifup(lp))
-                printk(KERN_DEBUG
-                       "%s: pcnet32 open after %d ticks, init block %#x csr0 %4.4x.\n",
-                       dev->name, i,
-                       (u32) (lp->init_dma_addr),
-                       lp->a.read_csr(ioaddr, CSR0));
+        netif_printk(lp, ifup, KERN_DEBUG, dev,
+                     "pcnet32 open after %d ticks, init block %#x csr0 %4.4x\n",
+                     i,
+                     (u32) (lp->init_dma_addr),
+                     lp->a.read_csr(ioaddr, CSR0));
 
         spin_unlock_irqrestore(&lp->lock, flags);
 
         return 0;               /* Always succeed */
 
-      err_free_ring:
+err_free_ring:
         /* free any allocated skbuffs */
         pcnet32_purge_rx_ring(dev);
 
@@ -2315,7 +2240,7 @@ static int pcnet32_open(struct net_device *dev)
          */
         lp->a.write_bcr(ioaddr, 20, 4);
 
-      err_free_irq:
+err_free_irq:
         spin_unlock_irqrestore(&lp->lock, flags);
         free_irq(dev->irq, dev);
         return rc;
@@ -2366,14 +2291,12 @@ static int pcnet32_init_ring(struct net_device *dev)
         for (i = 0; i < lp->rx_ring_size; i++) {
                 struct sk_buff *rx_skbuff = lp->rx_skbuff[i];
                 if (rx_skbuff == NULL) {
-                        if (!
-                            (rx_skbuff = lp->rx_skbuff[i] =
-                             dev_alloc_skb(PKT_BUF_SKB))) {
-                                /* there is not much, we can do at this point */
-                                if (netif_msg_drv(lp))
-                                        printk(KERN_ERR
-                                               "%s: pcnet32_init_ring dev_alloc_skb failed.\n",
-                                               dev->name);
+                        lp->rx_skbuff[i] = dev_alloc_skb(PKT_BUF_SKB);
+                        rx_skbuff = lp->rx_skbuff[i];
+                        if (!rx_skbuff) {
+                                /* there is not much we can do at this point */
+                                netif_err(lp, drv, dev, "%s dev_alloc_skb failed\n",
+                                          __func__);
                                 return -1;
                         }
                         skb_reserve(rx_skbuff, NET_IP_ALIGN);
@@ -2423,10 +2346,9 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
                 if (lp->a.read_csr(ioaddr, CSR0) & CSR0_STOP)
                         break;
 
-        if (i >= 100 && netif_msg_drv(lp))
-                printk(KERN_ERR
-                       "%s: pcnet32_restart timed out waiting for stop.\n",
-                       dev->name);
+        if (i >= 100)
+                netif_err(lp, drv, dev, "%s timed out waiting for stop\n",
+                          __func__);
 
         pcnet32_purge_tx_ring(dev);
         if (pcnet32_init_ring(dev))
@@ -2450,8 +2372,7 @@ static void pcnet32_tx_timeout(struct net_device *dev)
         spin_lock_irqsave(&lp->lock, flags);
         /* Transmitter timeout, serious problems. */
         if (pcnet32_debug & NETIF_MSG_DRV)
-                printk(KERN_ERR
-                       "%s: transmit timed out, status %4.4x, resetting.\n",
+                pr_err("%s: transmit timed out, status %4.4x, resetting\n",
                        dev->name, lp->a.read_csr(ioaddr, CSR0));
         lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
         dev->stats.tx_errors++;
@@ -2494,11 +2415,9 @@ static netdev_tx_t pcnet32_start_xmit(struct sk_buff *skb,
 
         spin_lock_irqsave(&lp->lock, flags);
 
-        if (netif_msg_tx_queued(lp)) {
-                printk(KERN_DEBUG
-                       "%s: pcnet32_start_xmit() called, csr0 %4.4x.\n",
-                       dev->name, lp->a.read_csr(ioaddr, CSR0));
-        }
+        netif_printk(lp, tx_queued, KERN_DEBUG, dev,
+                     "%s() called, csr0 %4.4x\n",
+                     __func__, lp->a.read_csr(ioaddr, CSR0));
 
         /* Default status -- will not enable Successful-TxDone
          * interrupt when that option is available to us.
@@ -2557,16 +2476,14 @@ pcnet32_interrupt(int irq, void *dev_id)
 
         csr0 = lp->a.read_csr(ioaddr, CSR0);
         while ((csr0 & 0x8f00) && --boguscnt >= 0) {
-                if (csr0 == 0xffff) {
+                if (csr0 == 0xffff)
                         break;  /* PCMCIA remove happened */
-                }
                 /* Acknowledge all of the current interrupt sources ASAP. */
                 lp->a.write_csr(ioaddr, CSR0, csr0 & ~0x004f);
 
-                if (netif_msg_intr(lp))
-                        printk(KERN_DEBUG
-                               "%s: interrupt  csr0=%#2.2x new csr=%#2.2x.\n",
-                               dev->name, csr0, lp->a.read_csr(ioaddr, CSR0));
+                netif_printk(lp, intr, KERN_DEBUG, dev,
+                             "interrupt  csr0=%#2.2x new csr=%#2.2x\n",
+                             csr0, lp->a.read_csr(ioaddr, CSR0));
 
                 /* Log misc errors. */
                 if (csr0 & 0x4000)
@@ -2586,10 +2503,8 @@ pcnet32_interrupt(int irq, void *dev_id)
                         dev->stats.rx_errors++; /* Missed a Rx frame. */
                 }
                 if (csr0 & 0x0800) {
-                        if (netif_msg_drv(lp))
-                                printk(KERN_ERR
-                                       "%s: Bus master arbitration failure, status %4.4x.\n",
-                                       dev->name, csr0);
+                        netif_err(lp, drv, dev, "Bus master arbitration failure, status %4.4x\n",
+                                  csr0);
                         /* unlike for the lance, there is no restart needed */
                 }
                 if (napi_schedule_prep(&lp->napi)) {
@@ -2605,9 +2520,9 @@ pcnet32_interrupt(int irq, void *dev_id)
                 csr0 = lp->a.read_csr(ioaddr, CSR0);
         }
 
-        if (netif_msg_intr(lp))
-                printk(KERN_DEBUG "%s: exiting interrupt, csr0=%#4.4x.\n",
-                       dev->name, lp->a.read_csr(ioaddr, CSR0));
+        netif_printk(lp, intr, KERN_DEBUG, dev,
+                     "exiting interrupt, csr0=%#4.4x\n",
+                     lp->a.read_csr(ioaddr, CSR0));
 
         spin_unlock(&lp->lock);
 
@@ -2629,10 +2544,9 @@ static int pcnet32_close(struct net_device *dev)
 
         dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
 
-        if (netif_msg_ifdown(lp))
-                printk(KERN_DEBUG
-                       "%s: Shutting down ethercard, status was %2.2x.\n",
-                       dev->name, lp->a.read_csr(ioaddr, CSR0));
+        netif_printk(lp, ifdown, KERN_DEBUG, dev,
+                     "Shutting down ethercard, status was %2.2x\n",
+                     lp->a.read_csr(ioaddr, CSR0));
 
         /* We stop the PCNET32 here -- it occasionally polls memory if we don't. */
         lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
@@ -2676,7 +2590,7 @@ static void pcnet32_load_multicast(struct net_device *dev)
         struct pcnet32_private *lp = netdev_priv(dev);
         volatile struct pcnet32_init_block *ib = lp->init_block;
         volatile __le16 *mcast_table = (__le16 *)ib->filter;
-        struct dev_mc_list *dmi = dev->mc_list;
+        struct dev_mc_list *dmi;
         unsigned long ioaddr = dev->base_addr;
         char *addrs;
         int i;
@@ -2697,9 +2611,8 @@ static void pcnet32_load_multicast(struct net_device *dev)
         ib->filter[1] = 0;
 
         /* Add addresses */
-        for (i = 0; i < dev->mc_count; i++) {
+        netdev_for_each_mc_addr(dmi, dev) {
                 addrs = dmi->dmi_addr;
-                dmi = dmi->next;
 
                 /* multicast address? */
                 if (!(*addrs & 1))
@@ -2729,9 +2642,7 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
         csr15 = lp->a.read_csr(ioaddr, CSR15);
         if (dev->flags & IFF_PROMISC) {
                 /* Log any net taps. */
-                if (netif_msg_hw(lp))
-                        printk(KERN_INFO "%s: Promiscuous mode enabled.\n",
-                               dev->name);
+                netif_info(lp, hw, dev, "Promiscuous mode enabled\n");
                 lp->init_block->mode =
                     cpu_to_le16(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) <<
                                 7);
@@ -2818,10 +2729,8 @@ static int pcnet32_check_otherphy(struct net_device *dev)
                         mii.phy_id = i;
                         if (mii_link_ok(&mii)) {
                                 /* found PHY with active link */
-                                if (netif_msg_link(lp))
-                                        printk(KERN_INFO
-                                               "%s: Using PHY number %d.\n",
-                                               dev->name, i);
+                                netif_info(lp, link, dev, "Using PHY number %d\n",
+                                           i);
 
                                 /* isolate inactive phy */
                                 bmcr =
@@ -2867,8 +2776,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
         if (!curr_link) {
                 if (prev_link || verbose) {
                         netif_carrier_off(dev);
-                        if (netif_msg_link(lp))
-                                printk(KERN_INFO "%s: link down\n", dev->name);
+                        netif_info(lp, link, dev, "link down\n");
                 }
                 if (lp->phycount > 1) {
                         curr_link = pcnet32_check_otherphy(dev);
@@ -2880,12 +2788,11 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
                         if (netif_msg_link(lp)) {
                                 struct ethtool_cmd ecmd;
                                 mii_ethtool_gset(&lp->mii_if, &ecmd);
-                                printk(KERN_INFO
-                                       "%s: link up, %sMbps, %s-duplex\n",
-                                       dev->name,
-                                       (ecmd.speed == SPEED_100) ? "100" : "10",
-                                       (ecmd.duplex ==
-                                        DUPLEX_FULL) ? "full" : "half");
+                                netdev_info(dev, "link up, %sMbps, %s-duplex\n",
+                                            (ecmd.speed == SPEED_100)
+                                            ? "100" : "10",
+                                            (ecmd.duplex == DUPLEX_FULL)
+                                            ? "full" : "half");
                         }
                         bcr9 = lp->a.read_bcr(dev->base_addr, 9);
                         if ((bcr9 & (1 << 0)) != lp->mii_if.full_duplex) {
@@ -2896,8 +2803,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
                                 lp->a.write_bcr(dev->base_addr, 9, bcr9);
                         }
                 } else {
-                        if (netif_msg_link(lp))
-                                printk(KERN_INFO "%s: link up\n", dev->name);
+                        netif_info(lp, link, dev, "link up\n");
                 }
         }
 }
@@ -3009,7 +2915,7 @@ MODULE_LICENSE("GPL");
 
 static int __init pcnet32_init_module(void)
 {
-        printk(KERN_INFO "%s", version);
+        pr_info("%s", version);
 
         pcnet32_debug = netif_msg_init(debug, PCNET32_MSG_DEFAULT);
 
@@ -3025,7 +2931,7 @@ static int __init pcnet32_init_module(void)
                 pcnet32_probe_vlbus(pcnet32_portlist);
 
         if (cards_found && (pcnet32_debug & NETIF_MSG_PROBE))
-                printk(KERN_INFO PFX "%d cards_found.\n", cards_found);
+                pr_info("%d cards_found\n", cards_found);
 
         return (pcnet32_have_pci + cards_found) ? 0 : -ENODEV;
 }