17 files changed, 476 insertions, 627 deletions
diff --git a/drivers/net/tulip/21142.c b/drivers/net/tulip/21142.c
index 007d8e75666d..092c3faa882a 100644
--- a/drivers/net/tulip/21142.c
+++ b/drivers/net/tulip/21142.c
@@ -122,8 +122,8 @@ void t21142_start_nway(struct net_device *dev)
        tp->nway = tp->mediasense = 1;
        tp->nwayset = tp->lpar = 0;
        if (tulip_debug > 1)
-                printk(KERN_DEBUG "%s: Restarting 21143 autonegotiation, csr14=%08x\n",
+                netdev_dbg(dev, "Restarting 21143 autonegotiation, csr14=%08x\n",
-                       dev->name, csr14);
+                           csr14);
        iowrite32(0x0001, ioaddr + CSR13);
        udelay(100);
        iowrite32(csr14, ioaddr + CSR14);
@@ -206,14 +206,14 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
 #if 0                                                   /* Restart shouldn't be needed. */
                iowrite32(tp->csr6 | RxOn, ioaddr + CSR6);
                if (tulip_debug > 2)
-                        printk(KERN_DEBUG "%s:  Restarting Tx and Rx, CSR5 is %08x\n",
+                        netdev_dbg(dev, " Restarting Tx and Rx, CSR5 is %08x\n",
-                               dev->name, ioread32(ioaddr + CSR5));
+                                   ioread32(ioaddr + CSR5));
 #endif
                tulip_start_rxtx(tp);
                if (tulip_debug > 2)
-                        printk(KERN_DEBUG "%s:  Setting CSR6 %08x/%x CSR12 %08x\n",
+                        netdev_dbg(dev, " Setting CSR6 %08x/%x CSR12 %08x\n",
-                               dev->name, tp->csr6, ioread32(ioaddr + CSR6),
+                                   tp->csr6, ioread32(ioaddr + CSR6),
-                               ioread32(ioaddr + CSR12));
+                                   ioread32(ioaddr + CSR12));
        } else if ((tp->nwayset  &&  (csr5 & 0x08000000) &&
                    (dev->if_port == 3  ||  dev->if_port == 5) &&
                    (csr12 & 2) == 2) ||
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig
index 516713fa0a05..1f8d4a8d8ea4 100644
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/tulip/Kconfig
@@ -11,8 +11,8 @@ menuconfig NET_TULIP
 if NET_TULIP
 config DE2104X
-        tristate "Early DECchip Tulip (dc2104x) PCI support (EXPERIMENTAL)"
+        tristate "Early DECchip Tulip (dc2104x) PCI support"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
        select CRC32
        ---help---
          This driver is developed for the SMC EtherPower series Ethernet
@@ -151,7 +151,7 @@ config ULI526X
        select CRC32
        ---help---
          This driver is for ULi M5261/M5263 10/100M Ethernet Controller
-          (<http://www.uli.com.tw/>).
+          (<http://www.nvidia.com/page/uli_drivers.html>).
          To compile this driver as a module, choose M here. The module will
          be called uli526x.
diff --git a/drivers/net/tulip/Makefile b/drivers/net/tulip/Makefile
index 200cbf7c815c..5e8be38b45bb 100644
--- a/drivers/net/tulip/Makefile
+++ b/drivers/net/tulip/Makefile
@@ -2,6 +2,8 @@
 # Makefile for the Linux "Tulip" family network device drivers.
 #
+ccflags-$(CONFIG_NET_TULIP)     := -DDEBUG
 obj-$(CONFIG_PCMCIA_XIRCOM)     += xircom_cb.o
 obj-$(CONFIG_DM9102)            += dmfe.o
 obj-$(CONFIG_WINBOND_840)       += winbond-840.o
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 6888e3d41462..e2f692351180 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -27,6 +27,8 @@
 */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #define DRV_NAME                "de2104x"
 #define DRV_VERSION             "0.7"
 #define DRV_RELDATE             "Mar 17, 2004"
@@ -51,7 +53,7 @@
 /* These identify the driver base version and may not be removed. */
 static char version[] =
-KERN_INFO DRV_NAME " PCI Ethernet driver v" DRV_VERSION " (" DRV_RELDATE ")\n";
+"PCI Ethernet driver v" DRV_VERSION " (" DRV_RELDATE ")";
 MODULE_AUTHOR("Jeff Garzik <jgarzik@pobox.com>");
 MODULE_DESCRIPTION("Intel/Digital 21040/1 series PCI Ethernet driver");
@@ -73,8 +75,6 @@ static int rx_copybreak = 100;
 module_param (rx_copybreak, int, 0);
 MODULE_PARM_DESC (rx_copybreak, "de2104x Breakpoint at which Rx packets are copied");
-#define PFX                     DRV_NAME ": "
 #define DE_DEF_MSG_ENABLE       (NETIF_MSG_DRV          | \
                                 NETIF_MSG_PROBE        | \
                                 NETIF_MSG_LINK         | \
@@ -377,18 +377,16 @@ static u16 t21041_csr15[] = { 0x0008, 0x0006, 0x000E, 0x0008, 0x0008, };
 static void de_rx_err_acct (struct de_private *de, unsigned rx_tail,
                            u32 status, u32 len)
 {
-        if (netif_msg_rx_err (de))
+        netif_dbg(de, rx_err, de->dev,
-                printk (KERN_DEBUG
+                  "rx err, slot %d status 0x%x len %d\n",
-                        "%s: rx err, slot %d status 0x%x len %d\n",
+                  rx_tail, status, len);
-                        de->dev->name, rx_tail, status, len);
        if ((status & 0x38000300) != 0x0300) {
                /* Ingore earlier buffers. */
                if ((status & 0xffff) != 0x7fff) {
-                        if (netif_msg_rx_err(de))
+                        netif_warn(de, rx_err, de->dev,
-                                dev_warn(&de->dev->dev,
+                                   "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
-                                         "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
+                                   status);
-                                         status);
                        de->net_stats.rx_length_errors++;
                }
        } else if (status & RxError) {
@@ -435,10 +433,9 @@ static void de_rx (struct de_private *de)
                copying_skb = (len <= rx_copybreak);
-                if (unlikely(netif_msg_rx_status(de)))
+                netif_dbg(de, rx_status, de->dev,
-                        printk(KERN_DEBUG "%s: rx slot %d status 0x%x len %d copying? %d\n",
+                          "rx slot %d status 0x%x len %d copying? %d\n",
-                               de->dev->name, rx_tail, status, len,
+                          rx_tail, status, len, copying_skb);
-                               copying_skb);
                buflen = copying_skb ? (len + RX_OFFSET) : de->rx_buf_sz;
                copy_skb = dev_alloc_skb (buflen);
@@ -491,7 +488,7 @@ rx_next:
        }
        if (!rx_work)
-                dev_warn(&de->dev->dev, "rx work limit reached\n");
+                netdev_warn(de->dev, "rx work limit reached\n");
        de->rx_tail = rx_tail;
 }
@@ -506,10 +503,9 @@ static irqreturn_t de_interrupt (int irq, void *dev_instance)
        if ((!(status & (IntrOK|IntrErr))) || (status == 0xFFFF))
                return IRQ_NONE;
-        if (netif_msg_intr(de))
+        netif_dbg(de, intr, dev, "intr, status %08x mode %08x desc %u/%u/%u\n",
-                printk(KERN_DEBUG "%s: intr, status %08x mode %08x desc %u/%u/%u\n",
+                  status, dr32(MacMode),
-                       dev->name, status, dr32(MacMode),
+                  de->rx_tail, de->tx_head, de->tx_tail);
-                       de->rx_tail, de->tx_head, de->tx_tail);
        dw32(MacStatus, status);
@@ -534,9 +530,9 @@ static irqreturn_t de_interrupt (int irq, void *dev_instance)
                pci_read_config_word(de->pdev, PCI_STATUS, &pci_status);
                pci_write_config_word(de->pdev, PCI_STATUS, pci_status);
-                dev_err(&de->dev->dev,
+                netdev_err(de->dev,
-                        "PCI bus error, status=%08x, PCI status=%04x\n",
+                           "PCI bus error, status=%08x, PCI status=%04x\n",
-                        status, pci_status);
+                           status, pci_status);
        }
        return IRQ_HANDLED;
@@ -572,9 +568,9 @@ static void de_tx (struct de_private *de)
                if (status & LastFrag) {
                        if (status & TxError) {
-                                if (netif_msg_tx_err(de))
+                                netif_dbg(de, tx_err, de->dev,
-                                        printk(KERN_DEBUG "%s: tx err, status 0x%x\n",
+                                          "tx err, status 0x%x\n",
-                                               de->dev->name, status);
+                                          status);
                                de->net_stats.tx_errors++;
                                if (status & TxOWC)
                                        de->net_stats.tx_window_errors++;
@@ -587,9 +583,8 @@ static void de_tx (struct de_private *de)
                        } else {
                                de->net_stats.tx_packets++;
                                de->net_stats.tx_bytes += skb->len;
-                                if (netif_msg_tx_done(de))
+                                netif_dbg(de, tx_done, de->dev,
-                                        printk(KERN_DEBUG "%s: tx done, slot %d\n",
+                                          "tx done, slot %d\n", tx_tail);
-                                               de->dev->name, tx_tail);
                        }
                        dev_kfree_skb_irq(skb);
                }
@@ -646,9 +641,8 @@ static netdev_tx_t de_start_xmit (struct sk_buff *skb,
        wmb();
        de->tx_head = NEXT_TX(entry);
-        if (netif_msg_tx_queued(de))
+        netif_dbg(de, tx_queued, dev, "tx queued, slot %d, skblen %d\n",
-                printk(KERN_DEBUG "%s: tx queued, slot %d, skblen %d\n",
+                  entry, skb->len);
-                       dev->name, entry, skb->len);
        if (tx_free == 0)
                netif_stop_queue(dev);
@@ -873,7 +867,7 @@ static void de_stop_rxtx (struct de_private *de)
                udelay(100);
        }
-        dev_warn(&de->dev->dev, "timeout expired stopping DMA\n");
+        netdev_warn(de->dev, "timeout expired, stopping DMA\n");
 }
 static inline void de_start_rxtx (struct de_private *de)
@@ -907,9 +901,8 @@ static void de_link_up(struct de_private *de)
 {
        if (!netif_carrier_ok(de->dev)) {
                netif_carrier_on(de->dev);
-                if (netif_msg_link(de))
+                netif_info(de, link, de->dev, "link up, media %s\n",
-                        dev_info(&de->dev->dev, "link up, media %s\n",
+                           media_name[de->media_type]);
-                                 media_name[de->media_type]);
        }
 }
@@ -917,8 +910,7 @@ static void de_link_down(struct de_private *de)
 {
        if (netif_carrier_ok(de->dev)) {
                netif_carrier_off(de->dev);
-                if (netif_msg_link(de))
+                netif_info(de, link, de->dev, "link down\n");
-                        dev_info(&de->dev->dev, "link down\n");
        }
 }
@@ -928,8 +920,7 @@ static void de_set_media (struct de_private *de)
        u32 macmode = dr32(MacMode);
        if (de_is_running(de))
-                dev_warn(&de->dev->dev,
+                netdev_warn(de->dev, "chip is running while changing media!\n");
-                         "chip is running while changing media!\n");
        if (de->de21040)
                dw32(CSR11, FULL_DUPLEX_MAGIC);
@@ -948,22 +939,18 @@ static void de_set_media (struct de_private *de)
        else
                macmode &= ~FullDuplex;
-        if (netif_msg_link(de)) {
+        netif_info(de, link, de->dev, "set link %s\n", media_name[media]);
-                dev_info(&de->dev->dev, "set link %s\n", media_name[media]);
+        netif_info(de, hw, de->dev, "mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n",
-                dev_info(&de->dev->dev, "mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n",
+                   dr32(MacMode), dr32(SIAStatus),
-                         dr32(MacMode), dr32(SIAStatus),
+                   dr32(CSR13), dr32(CSR14), dr32(CSR15));
-                         dr32(CSR13), dr32(CSR14), dr32(CSR15));
+        netif_info(de, hw, de->dev, "set mode 0x%x, set sia 0x%x,0x%x,0x%x\n",
+                   macmode, de->media[media].csr13,
-                dev_info(&de->dev->dev,
+                   de->media[media].csr14, de->media[media].csr15);
-                         "set mode 0x%x, set sia 0x%x,0x%x,0x%x\n",
-                         macmode, de->media[media].csr13,
-                         de->media[media].csr14, de->media[media].csr15);
-        }
        if (macmode != dr32(MacMode))
                dw32(MacMode, macmode);
 }
-static void de_next_media (struct de_private *de, u32 *media,
+static void de_next_media (struct de_private *de, const u32 *media,
                           unsigned int n_media)
 {
        unsigned int i;
@@ -995,9 +982,8 @@ static void de21040_media_timer (unsigned long data)
                if (!netif_carrier_ok(dev))
                        de_link_up(de);
                else
-                        if (netif_msg_timer(de))
+                        netif_info(de, timer, dev, "%s link ok, status %x\n",
-                                dev_info(&dev->dev, "%s link ok, status %x\n",
+                                   media_name[de->media_type], status);
-                                         media_name[de->media_type], status);
                return;
        }
@@ -1007,10 +993,10 @@ static void de21040_media_timer (unsigned long data)
                return;
        if (de->media_type == DE_MEDIA_AUI) {
-                u32 next_state = DE_MEDIA_TP;
+                static const u32 next_state = DE_MEDIA_TP;
                de_next_media(de, &next_state, 1);
        } else {
-                u32 next_state = DE_MEDIA_AUI;
+                static const u32 next_state = DE_MEDIA_AUI;
                de_next_media(de, &next_state, 1);
        }
@@ -1024,9 +1010,8 @@ no_link_yet:
        de->media_timer.expires = jiffies + DE_TIMER_NO_LINK;
        add_timer(&de->media_timer);
-        if (netif_msg_timer(de))
+        netif_info(de, timer, dev, "no link, trying media %s, status %x\n",
-                dev_info(&dev->dev, "no link, trying media %s, status %x\n",
+                   media_name[de->media_type], status);
-                         media_name[de->media_type], status);
 }
 static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media)
@@ -1084,11 +1069,10 @@ static void de21041_media_timer (unsigned long data)
                if (!netif_carrier_ok(dev))
                        de_link_up(de);
                else
-                        if (netif_msg_timer(de))
+                        netif_info(de, timer, dev,
-                                dev_info(&dev->dev,
+                                   "%s link ok, mode %x status %x\n",
-                                         "%s link ok, mode %x status %x\n",
+                                   media_name[de->media_type],
-                                         media_name[de->media_type],
+                                   dr32(MacMode), status);
-                                         dr32(MacMode), status);
                return;
        }
@@ -1135,13 +1119,19 @@ static void de21041_media_timer (unsigned long data)
         * simply resets the PHY and reloads the current media settings.
         */
        if (de->media_type == DE_MEDIA_AUI) {
-                u32 next_states[] = { DE_MEDIA_BNC, DE_MEDIA_TP_AUTO };
+                static const u32 next_states[] = {
+                        DE_MEDIA_BNC, DE_MEDIA_TP_AUTO
+                };
                de_next_media(de, next_states, ARRAY_SIZE(next_states));
        } else if (de->media_type == DE_MEDIA_BNC) {
-                u32 next_states[] = { DE_MEDIA_TP_AUTO, DE_MEDIA_AUI };
+                static const u32 next_states[] = {
+                        DE_MEDIA_TP_AUTO, DE_MEDIA_AUI
+                };
                de_next_media(de, next_states, ARRAY_SIZE(next_states));
        } else {
-                u32 next_states[] = { DE_MEDIA_AUI, DE_MEDIA_BNC, DE_MEDIA_TP_AUTO };
+                static const u32 next_states[] = {
+                        DE_MEDIA_AUI, DE_MEDIA_BNC, DE_MEDIA_TP_AUTO
+                };
                de_next_media(de, next_states, ARRAY_SIZE(next_states));
        }
@@ -1156,9 +1146,8 @@ no_link_yet:
        de->media_timer.expires = jiffies + DE_TIMER_NO_LINK;
        add_timer(&de->media_timer);
-        if (netif_msg_timer(de))
+        netif_info(de, timer, dev, "no link, trying media %s, status %x\n",
-                dev_info(&dev->dev, "no link, trying media %s, status %x\n",
+                   media_name[de->media_type], status);
-                         media_name[de->media_type], status);
 }
 static void de_media_interrupt (struct de_private *de, u32 status)
@@ -1394,14 +1383,13 @@ static int de_open (struct net_device *dev)
        struct de_private *de = netdev_priv(dev);
        int rc;
-        if (netif_msg_ifup(de))
+        netif_dbg(de, ifup, dev, "enabling interface\n");
-                printk(KERN_DEBUG "%s: enabling interface\n", dev->name);
        de->rx_buf_sz = (dev->mtu <= 1500 ? PKT_BUF_SZ : dev->mtu + 32);
        rc = de_alloc_rings(de);
        if (rc) {
-                dev_err(&dev->dev, "ring allocation failure, err=%d\n", rc);
+                netdev_err(dev, "ring allocation failure, err=%d\n", rc);
                return rc;
        }
@@ -1409,14 +1397,14 @@ static int de_open (struct net_device *dev)
        rc = request_irq(dev->irq, de_interrupt, IRQF_SHARED, dev->name, dev);
        if (rc) {
-                dev_err(&dev->dev, "IRQ %d request failure, err=%d\n",
+                netdev_err(dev, "IRQ %d request failure, err=%d\n",
-                        dev->irq, rc);
+                           dev->irq, rc);
                goto err_out_free;
        }
        rc = de_init_hw(de);
        if (rc) {
-                dev_err(&dev->dev, "h/w init failure, err=%d\n", rc);
+                netdev_err(dev, "h/w init failure, err=%d\n", rc);
                goto err_out_free_irq;
        }
@@ -1437,8 +1425,7 @@ static int de_close (struct net_device *dev)
        struct de_private *de = netdev_priv(dev);
        unsigned long flags;
-        if (netif_msg_ifdown(de))
+        netif_dbg(de, ifdown, dev, "disabling interface\n");
-                printk(KERN_DEBUG "%s: disabling interface\n", dev->name);
        del_timer_sync(&de->media_timer);
@@ -1459,9 +1446,9 @@ static void de_tx_timeout (struct net_device *dev)
 {
        struct de_private *de = netdev_priv(dev);
-        printk(KERN_DEBUG "%s: NIC status %08x mode %08x sia %08x desc %u/%u/%u\n",
+        netdev_dbg(dev, "NIC status %08x mode %08x sia %08x desc %u/%u/%u\n",
-               dev->name, dr32(MacStatus), dr32(MacMode), dr32(SIAStatus),
+                   dr32(MacStatus), dr32(MacMode), dr32(SIAStatus),
-               de->rx_tail, de->tx_head, de->tx_tail);
+                   de->rx_tail, de->tx_head, de->tx_tail);
        del_timer_sync(&de->media_timer);
@@ -1511,18 +1498,17 @@ static int __de_get_settings(struct de_private *de, struct ethtool_cmd *ecmd)
        switch (de->media_type) {
        case DE_MEDIA_AUI:
                ecmd->port = PORT_AUI;
-                ecmd->speed = 5;
                break;
        case DE_MEDIA_BNC:
                ecmd->port = PORT_BNC;
-                ecmd->speed = 2;
                break;
        default:
                ecmd->port = PORT_TP;
-                ecmd->speed = SPEED_10;
                break;
        }
+        ethtool_cmd_speed_set(ecmd, 10);
        if (dr32(MacMode) & FullDuplex)
                ecmd->duplex = DUPLEX_FULL;
        else
@@ -1543,9 +1529,7 @@ static int __de_set_settings(struct de_private *de, struct ethtool_cmd *ecmd)
        u32 new_media;
        unsigned int media_lock;
-        if (ecmd->speed != SPEED_10 && ecmd->speed != 5 && ecmd->speed != 2)
+        if (ethtool_cmd_speed(ecmd) != 10)
-                return -EINVAL;
-        if (de->de21040 && ecmd->speed == 2)
                return -EINVAL;
        if (ecmd->duplex != DUPLEX_HALF && ecmd->duplex != DUPLEX_FULL)
                return -EINVAL;
@@ -1689,9 +1673,8 @@ static int de_nway_reset(struct net_device *dev)
        status = dr32(SIAStatus);
        dw32(SIAStatus, (status & ~NWayState) | NWayRestart);
-        if (netif_msg_link(de))
+        netif_info(de, link, dev, "link nway restart, status %x,%x\n",
-                dev_info(&de->dev->dev, "link nway restart, status %x,%x\n",
+                   status, dr32(SIAStatus));
-                         status, dr32(SIAStatus));
        return 0;
 }
@@ -1736,7 +1719,8 @@ static void __devinit de21040_get_mac_address (struct de_private *de)
                de->dev->dev_addr[i] = value;
                udelay(1);
                if (boguscnt <= 0)
-                        pr_warning(PFX "timeout reading 21040 MAC address byte %u\n", i);
+                        pr_warn("timeout reading 21040 MAC address byte %u\n",
+                                i);
        }
 }
@@ -1922,8 +1906,10 @@ static void __devinit de21041_get_srom_info (struct de_private *de)
                                        de->media[idx].csr14,
                                        de->media[idx].csr15);
-                } else if (netif_msg_probe(de))
+                } else {
-                        pr_cont("\n");
+                        if (netif_msg_probe(de))
+                                pr_cont("\n");
+                }
                if (bufp > ((void *)&ee_data[DE_EEPROM_SIZE - 3]))
                        break;
@@ -1992,7 +1978,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
 #ifndef MODULE
        if (board_idx == 0)
-                printk("%s", version);
+                pr_info("%s\n", version);
 #endif
        /* allocate a new ethernet device structure, and fill in defaults */
@@ -2020,7 +2006,6 @@ static int __devinit de_init_one (struct pci_dev *pdev,
        de->media_timer.data = (unsigned long) de;
        netif_carrier_off(dev);
-        netif_stop_queue(dev);
        /* wake up device, assign resources */
        rc = pci_enable_device(pdev);
@@ -2035,7 +2020,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
        /* check for invalid IRQ value */
        if (pdev->irq < 2) {
                rc = -EIO;
-                pr_err(PFX "invalid irq (%d) for pci dev %s\n",
+                pr_err("invalid irq (%d) for pci dev %s\n",
                       pdev->irq, pci_name(pdev));
                goto err_out_res;
        }
@@ -2046,12 +2031,12 @@ static int __devinit de_init_one (struct pci_dev *pdev,
        pciaddr = pci_resource_start(pdev, 1);
        if (!pciaddr) {
                rc = -EIO;
-                pr_err(PFX "no MMIO resource for pci dev %s\n", pci_name(pdev));
+                pr_err("no MMIO resource for pci dev %s\n", pci_name(pdev));
                goto err_out_res;
        }
        if (pci_resource_len(pdev, 1) < DE_REGS_SIZE) {
                rc = -EIO;
-                pr_err(PFX "MMIO resource (%llx) too small on pci dev %s\n",
+                pr_err("MMIO resource (%llx) too small on pci dev %s\n",
                       (unsigned long long)pci_resource_len(pdev, 1),
                       pci_name(pdev));
                goto err_out_res;
@@ -2061,7 +2046,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
        regs = ioremap_nocache(pciaddr, DE_REGS_SIZE);
        if (!regs) {
                rc = -EIO;
-                pr_err(PFX "Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n",
+                pr_err("Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n",
                       (unsigned long long)pci_resource_len(pdev, 1),
                       pciaddr, pci_name(pdev));
                goto err_out_res;
@@ -2074,7 +2059,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
        /* make sure hardware is not running */
        rc = de_reset_mac(de);
        if (rc) {
-                pr_err(PFX "Cannot reset MAC, pci dev %s\n", pci_name(pdev));
+                pr_err("Cannot reset MAC, pci dev %s\n", pci_name(pdev));
                goto err_out_iomap;
        }
@@ -2094,11 +2079,11 @@ static int __devinit de_init_one (struct pci_dev *pdev,
                goto err_out_iomap;
        /* print info about board and interface just registered */
-        dev_info(&dev->dev, "%s at 0x%lx, %pM, IRQ %d\n",
+        netdev_info(dev, "%s at 0x%lx, %pM, IRQ %d\n",
-                 de->de21040 ? "21040" : "21041",
+                    de->de21040 ? "21040" : "21041",
-                 dev->base_addr,
+                    dev->base_addr,
-                 dev->dev_addr,
+                    dev->dev_addr,
-                 dev->irq);
+                    dev->irq);
        pci_set_drvdata(pdev, dev);
@@ -2186,7 +2171,7 @@ static int de_resume (struct pci_dev *pdev)
        if (!netif_running(dev))
                goto out_attach;
        if ((retval = pci_enable_device(pdev))) {
-                dev_err(&dev->dev, "pci_enable_device failed in resume\n");
+                netdev_err(dev, "pci_enable_device failed in resume\n");
                goto out;
        }
        pci_set_master(pdev);
@@ -2215,7 +2200,7 @@ static struct pci_driver de_driver = {
 static int __init de_init (void)
 {
 #ifdef MODULE
-        printk("%s", version);
+        pr_info("%s\n", version);
 #endif
        return pci_register_driver(&de_driver);
 }
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 75a64c88cf7a..efaa1d69b720 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -79,7 +79,7 @@
    every  usable DECchip board,  I  pinched Donald's 'next_module' field to
    link my modules together.
-    Upto 15 EISA cards can be supported under this driver, limited primarily
+    Up to 15 EISA cards can be supported under this driver, limited primarily
    by the available IRQ lines.  I have  checked different configurations of
    multiple depca, EtherWORKS 3 cards and de4x5 cards and  have not found a
    problem yet (provided you have at least depca.c v0.38) ...
@@ -517,7 +517,7 @@ struct mii_phy {
    u_int mci;              /* 21142 MII Connector Interrupt info        */
 };
-#define DE4X5_MAX_PHY 8     /* Allow upto 8 attached PHY devices per board */
+#define DE4X5_MAX_PHY 8     /* Allow up to 8 attached PHY devices per board */
 struct sia_phy {
    u_char mc;              /* Media Code                                */
@@ -1436,7 +1436,7 @@ de4x5_sw_reset(struct net_device *dev)
    /* Poll for setup frame completion (adapter interrupts are disabled now) */
-    for (j=0, i=0;(i<500) && (j==0);i++) {       /* Upto 500ms delay */
+    for (j=0, i=0;(i<500) && (j==0);i++) {       /* Up to 500ms delay */
        mdelay(1);
        if ((s32)le32_to_cpu(lp->tx_ring[lp->tx_new].status) >= 0) j=1;
    }
@@ -1448,7 +1448,7 @@ de4x5_sw_reset(struct net_device *dev)
        status = -EIO;
    }
-    lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+    lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
    lp->tx_old = lp->tx_new;
    return status;
@@ -1506,7 +1506,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)
            lp->stats.tx_bytes += skb->len;
            outl(POLL_DEMAND, DE4X5_TPD);/* Start the TX */
-            lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+            lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
            if (TX_BUFFS_AVAIL) {
                netif_start_queue(dev);         /* Another pkt may be queued */
@@ -1657,7 +1657,7 @@ de4x5_rx(struct net_device *dev)
            }
            /* Change buffer ownership for this frame, back to the adapter */
-            for (;lp->rx_old!=entry;lp->rx_old=(++lp->rx_old)%lp->rxRingSize) {
+            for (;lp->rx_old!=entry;lp->rx_old=(lp->rx_old + 1)%lp->rxRingSize) {
                lp->rx_ring[lp->rx_old].status = cpu_to_le32(R_OWN);
                barrier();
            }
@@ -1668,7 +1668,7 @@ de4x5_rx(struct net_device *dev)
        /*
        ** Update entry information
        */
-        lp->rx_new = (++lp->rx_new) % lp->rxRingSize;
+        lp->rx_new = (lp->rx_new + 1) % lp->rxRingSize;
    }
    return 0;
@@ -1726,7 +1726,7 @@ de4x5_tx(struct net_device *dev)
        }
        /* Update all the pointers */
-        lp->tx_old = (++lp->tx_old) % lp->txRingSize;
+        lp->tx_old = (lp->tx_old + 1) % lp->txRingSize;
    }
    /* Any resources available? */
@@ -1801,7 +1801,7 @@ de4x5_rx_ovfc(struct net_device *dev)
    for (; (s32)le32_to_cpu(lp->rx_ring[lp->rx_new].status)>=0;) {
        lp->rx_ring[lp->rx_new].status = cpu_to_le32(R_OWN);
-        lp->rx_new = (++lp->rx_new % lp->rxRingSize);
+        lp->rx_new = (lp->rx_new + 1) % lp->rxRingSize;
    }
    outl(omr, DE4X5_OMR);
@@ -1932,7 +1932,7 @@ set_multicast_list(struct net_device *dev)
            load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET |
                                                        SETUP_FRAME_LEN, (struct sk_buff *)1);
-            lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+            lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
            outl(POLL_DEMAND, DE4X5_TPD);       /* Start the TX */
            dev->trans_start = jiffies; /* prevent tx timeout */
        }
@@ -3119,7 +3119,7 @@ dc2114x_autoconf(struct net_device *dev)
          if (lp->media == _100Mb) {
              if ((slnk = test_for_100Mb(dev, 6500)) < 0) {
                  lp->media = SPD_DET;
-                  return  (slnk & ~TIMER_CB);
+                  return slnk & ~TIMER_CB;
              }
          } else {
              if (wait_for_link(dev) < 0) {
@@ -3484,7 +3484,7 @@ is_spd_100(struct net_device *dev)
        spd = ((~gep_rd(dev)) & GEP_SLNK);
    } else {
        if ((lp->ibn == 2) || !lp->asBitValid)
-            return ((lp->chipset == DC21143)?(~inl(DE4X5_SISR)&SISR_LS100):0);
+            return (lp->chipset == DC21143) ? (~inl(DE4X5_SISR)&SISR_LS100) : 0;
        spd = (lp->asBitValid & (lp->asPolarity ^ (gep_rd(dev) & lp->asBit))) |
                  (lp->linkOK & ~lp->asBitValid);
@@ -3502,15 +3502,15 @@ is_100_up(struct net_device *dev)
    if (lp->useMII) {
        /* Double read for sticky bits & temporary drops */
        mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII);
-        return (mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_LKS);
+        return mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_LKS;
    } else if (!lp->useSROM) {                       /* de500-xa */
-        return ((~gep_rd(dev)) & GEP_SLNK);
+        return (~gep_rd(dev)) & GEP_SLNK;
    } else {
        if ((lp->ibn == 2) || !lp->asBitValid)
-            return ((lp->chipset == DC21143)?(~inl(DE4X5_SISR)&SISR_LS100):0);
+            return (lp->chipset == DC21143) ? (~inl(DE4X5_SISR)&SISR_LS100) : 0;
-        return ((lp->asBitValid&(lp->asPolarity^(gep_rd(dev)&lp->asBit))) |
+        return (lp->asBitValid&(lp->asPolarity^(gep_rd(dev)&lp->asBit))) |
-                (lp->linkOK & ~lp->asBitValid));
+                (lp->linkOK & ~lp->asBitValid);
    }
 }
@@ -3523,17 +3523,17 @@ is_10_up(struct net_device *dev)
    if (lp->useMII) {
        /* Double read for sticky bits & temporary drops */
        mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII);
-        return (mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_LKS);
+        return mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_LKS;
    } else if (!lp->useSROM) {                       /* de500-xa */
-        return ((~gep_rd(dev)) & GEP_LNP);
+        return (~gep_rd(dev)) & GEP_LNP;
    } else {
        if ((lp->ibn == 2) || !lp->asBitValid)
-            return (((lp->chipset & ~0x00ff) == DC2114x) ?
+            return ((lp->chipset & ~0x00ff) == DC2114x) ?
                    (~inl(DE4X5_SISR)&SISR_LS10):
-                    0);
+                    0;
-        return ((lp->asBitValid&(lp->asPolarity^(gep_rd(dev)&lp->asBit))) |
+        return  (lp->asBitValid&(lp->asPolarity^(gep_rd(dev)&lp->asBit))) |
-                (lp->linkOK & ~lp->asBitValid));
+                (lp->linkOK & ~lp->asBitValid);
    }
 }
@@ -3544,7 +3544,7 @@ is_anc_capable(struct net_device *dev)
    u_long iobase = dev->base_addr;
    if (lp->phy[lp->active].id && (!lp->useSROM || lp->useMII)) {
-        return (mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII));
+        return mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII);
    } else if ((lp->chipset & ~0x00ff) == DC2114x) {
        return (inl(DE4X5_SISR) & SISR_LPN) >> 12;
    } else {
@@ -3568,7 +3568,7 @@ ping_media(struct net_device *dev, int msec)
        lp->tmp = lp->tx_new;                /* Remember the ring position */
        load_packet(dev, lp->frame, TD_LS | TD_FS | sizeof(lp->frame), (struct sk_buff *)1);
-        lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+        lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
        outl(POLL_DEMAND, DE4X5_TPD);
    }
@@ -4930,7 +4930,7 @@ getfrom_mii(u32 command, u_long ioaddr)
    outl(command | MII_MDC, ioaddr);
    udelay(1);
-    return ((inl(ioaddr) >> 19) & 1);
+    return (inl(ioaddr) >> 19) & 1;
 }
 /*
@@ -4975,8 +4975,8 @@ mii_get_oui(u_char phyaddr, u_long ioaddr)
    a.breg[0]=a.breg[1];
    a.breg[1]=i;
-    return ((a.reg<<8)|ret); */                 /* SEEQ and Cypress way */
+    return (a.reg<<8)|ret; */                 /* SEEQ and Cypress way */
-/*    return ((r2<<6)|(u_int)(r3>>10)); */      /* NATIONAL and BROADCOM way */
+/*    return (r2<<6)|(u_int)(r3>>10); */      /* NATIONAL and BROADCOM way */
    return r2;                                  /* (I did it) My way */
 }
@@ -5144,7 +5144,7 @@ gep_rd(struct net_device *dev)
    if (lp->chipset == DC21140) {
        return inl(DE4X5_GEP);
    } else if ((lp->chipset & ~0x00ff) == DC2114x) {
-        return (inl(DE4X5_SIGR) & 0x000fffff);
+        return inl(DE4X5_SIGR) & 0x000fffff;
    }
    return 0;
@@ -5417,7 +5417,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        /* Set up the descriptor and give ownership to the card */
        load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET |
                                                       SETUP_FRAME_LEN, (struct sk_buff *)1);
-        lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+        lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
        outl(POLL_DEMAND, DE4X5_TPD);                /* Start the TX */
        netif_wake_queue(dev);                      /* Unlock the TX ring */
        break;
@@ -5474,7 +5474,8 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        tmp.lval[6] = inl(DE4X5_STRR); j+=4;
        tmp.lval[7] = inl(DE4X5_SIGR); j+=4;
        ioc->len = j;
-        if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
+        if (copy_to_user(ioc->data, tmp.lval, ioc->len))
+                return -EFAULT;
        break;
 #define DE4X5_DUMP              0x0f /* Dump the DE4X5 Status */
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 0bc4f3030a80..9a21ca3873fc 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -295,8 +295,7 @@ enum dmfe_CR6_bits {
 /* Global variable declaration ----------------------------- */
 static int __devinitdata printed_version;
 static const char version[] __devinitconst =
-        KERN_INFO DRV_NAME ": Davicom DM9xxx net driver, version "
+        "Davicom DM9xxx net driver, version " DRV_VERSION " (" DRV_RELDATE ")";
-        DRV_VERSION " (" DRV_RELDATE ")\n";
 static int dmfe_debug;
 static unsigned char dmfe_media_mode = DMFE_AUTO;
@@ -381,7 +380,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
        DMFE_DBUG(0, "dmfe_init_one()", 0);
        if (!printed_version++)
-                printk(version);
+                pr_info("%s\n", version);
        /*
         *      SPARC on-board DM910x chips should be handled by the main
@@ -406,7 +405,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
        SET_NETDEV_DEV(dev, &pdev->dev);
        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
-                pr_warning("32-bit PCI DMA not available\n");
+                pr_warn("32-bit PCI DMA not available\n");
                err = -ENODEV;
                goto err_out_free;
        }
@@ -599,7 +598,7 @@ static int dmfe_open(struct DEVICE *dev)
        init_timer(&db->timer);
        db->timer.expires = DMFE_TIMER_WUT + HZ * 2;
        db->timer.data = (unsigned long)dev;
-        db->timer.function = &dmfe_timer;
+        db->timer.function = dmfe_timer;
        add_timer(&db->timer);
        return 0;
@@ -688,9 +687,6 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,
        DMFE_DBUG(0, "dmfe_start_xmit", 0);
-        /* Resource flag check */
-        netif_stop_queue(dev);
        /* Too large packet check */
        if (skb->len > MAX_PACKET_SIZE) {
                pr_err("big packet = %d\n", (u16)skb->len);
@@ -698,6 +694,9 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,
                return NETDEV_TX_OK;
        }
+        /* Resource flag check */
+        netif_stop_queue(dev);
        spin_lock_irqsave(&db->lock, flags);
        /* No Tx resource check, it never happen nromally */
@@ -880,7 +879,6 @@ static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db)
        txptr = db->tx_remove_ptr;
        while(db->tx_packet_cnt) {
                tdes0 = le32_to_cpu(txptr->tdes0);
-                pr_debug("tdes0=%x\n", tdes0);
                if (tdes0 & 0x80000000)
                        break;
@@ -890,7 +888,6 @@ static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db)
                /* Transmit statistic counter */
                if ( tdes0 != 0x7fffffff ) {
-                        pr_debug("tdes0=%x\n", tdes0);
                        dev->stats.collisions += (tdes0 >> 3) & 0xf;
                        dev->stats.tx_bytes += le32_to_cpu(txptr->tdes1) & 0x7ff;
                        if (tdes0 & TDES0_ERR_MASK) {
@@ -987,7 +984,6 @@ static void dmfe_rx_packet(struct DEVICE *dev, struct dmfe_board_info * db)
                        /* error summary bit check */
                        if (rdes0 & 0x8000) {
                                /* This is a error packet */
-                                pr_debug("rdes0: %x\n", rdes0);
                                dev->stats.rx_errors++;
                                if (rdes0 & 1)
                                        dev->stats.rx_fifo_errors++;
@@ -1224,7 +1220,7 @@ static void dmfe_timer(unsigned long data)
        /* If chip reports that link is failed it could be because external
-                PHY link status pin is not conected correctly to chip
+                PHY link status pin is not connected correctly to chip
                To be sure ask PHY too.
        */
@@ -1639,7 +1635,6 @@ static u8 dmfe_sense_speed(struct dmfe_board_info * db)
                else                            /* DM9102/DM9102A */
                        phy_mode = phy_read(db->ioaddr,
                                    db->phy_addr, 17, db->chip_id) & 0xf000;
-                pr_debug("Phy_mode %x\n", phy_mode);
                switch (phy_mode) {
                case 0x1000: db->op_mode = DMFE_10MHF; break;
                case 0x2000: db->op_mode = DMFE_10MFD; break;
@@ -2203,7 +2198,7 @@ static int __init dmfe_init_module(void)
 {
        int rc;
-        printk(version);
+        pr_info("%s\n", version);
        printed_version = 1;
        DMFE_DBUG(0, "init_module() ", debug);
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
index 3031ed9c4a1a..fa5eee925f25 100644
--- a/drivers/net/tulip/eeprom.c
+++ b/drivers/net/tulip/eeprom.c
@@ -115,7 +115,7 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)
                          0x02,       /* phy reset sequence length */
                          0x01, 0x00, /* phy reset sequence */
                          0x00, 0x78, /* media capabilities */
-                          0x00, 0xe0, /* nway advertisment */
+                          0x00, 0xe0, /* nway advertisement */
                          0x00, 0x05, /* fdx bit map */
                          0x00, 0x06  /* ttm bit map */
                        };
@@ -222,8 +222,8 @@ subsequent_board:
                /* there is no phy information, don't even try to build mtable */
                if (count == 0) {
                        if (tulip_debug > 0)
-                                pr_warning("%s: no phy info, aborting mtable build\n",
+                                pr_warn("%s: no phy info, aborting mtable build\n",
-                                           dev->name);
+                                        dev->name);
                        return;
                }
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index 1faf7a4d7202..5350d753e0ff 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -125,12 +125,12 @@ int tulip_poll(struct napi_struct *napi, int budget)
 #endif
        if (tulip_debug > 4)
-                printk(KERN_DEBUG " In tulip_rx(), entry %d %08x\n",
+                netdev_dbg(dev, " In tulip_rx(), entry %d %08x\n",
-                       entry, tp->rx_ring[entry].status);
+                           entry, tp->rx_ring[entry].status);
       do {
                if (ioread32(tp->base_addr + CSR5) == 0xffffffff) {
-                        printk(KERN_DEBUG " In tulip_poll(), hardware disappeared\n");
+                        netdev_dbg(dev, " In tulip_poll(), hardware disappeared\n");
                        break;
                }
               /* Acknowledge current RX interrupt sources. */
@@ -145,9 +145,9 @@ int tulip_poll(struct napi_struct *napi, int budget)
                       if (tp->dirty_rx + RX_RING_SIZE == tp->cur_rx)
                               break;
-                       if (tulip_debug > 5)
+                       if (tulip_debug > 5)
-                               printk(KERN_DEBUG "%s: In tulip_rx(), entry %d %08x\n",
+                                netdev_dbg(dev, "In tulip_rx(), entry %d %08x\n",
-                                      dev->name, entry, status);
+                                           entry, status);
                       if (++work_done >= budget)
                               goto not_done;
@@ -180,21 +180,24 @@ int tulip_poll(struct napi_struct *napi, int budget)
                                                       dev_warn(&dev->dev,
                                                                "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
                                                                status);
-                                               tp->stats.rx_length_errors++;
+                                                dev->stats.rx_length_errors++;
-                                       }
+                                        }
                               } else {
                                /* There was a fatal error. */
-                                       if (tulip_debug > 2)
+                                       if (tulip_debug > 2)
-                                               printk(KERN_DEBUG "%s: Receive error, Rx status %08x\n",
+                                                netdev_dbg(dev, "Receive error, Rx status %08x\n",
-                                                      dev->name, status);
+                                                           status);
-                                       tp->stats.rx_errors++; /* end of a packet.*/
+                                        dev->stats.rx_errors++; /* end of a packet.*/
-                                       if (pkt_len > 1518 ||
+                                        if (pkt_len > 1518 ||
-                                           (status & RxDescRunt))
+                                            (status & RxDescRunt))
-                                               tp->stats.rx_length_errors++;
+                                                dev->stats.rx_length_errors++;
-                                       if (status & 0x0004) tp->stats.rx_frame_errors++;
+                                        if (status & 0x0004)
-                                       if (status & 0x0002) tp->stats.rx_crc_errors++;
+                                                dev->stats.rx_frame_errors++;
-                                       if (status & 0x0001) tp->stats.rx_fifo_errors++;
+                                        if (status & 0x0002)
+                                                dev->stats.rx_crc_errors++;
+                                        if (status & 0x0001)
+                                                dev->stats.rx_fifo_errors++;
                               }
                       } else {
                               struct sk_buff *skb;
@@ -244,8 +247,8 @@ int tulip_poll(struct napi_struct *napi, int budget)
                               netif_receive_skb(skb);
-                               tp->stats.rx_packets++;
+                                dev->stats.rx_packets++;
-                               tp->stats.rx_bytes += pkt_len;
+                                dev->stats.rx_bytes += pkt_len;
                       }
 #ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
                       received++;
@@ -364,16 +367,16 @@ static int tulip_rx(struct net_device *dev)
        int received = 0;
        if (tulip_debug > 4)
-                printk(KERN_DEBUG " In tulip_rx(), entry %d %08x\n",
+                netdev_dbg(dev, "In tulip_rx(), entry %d %08x\n",
-                       entry, tp->rx_ring[entry].status);
+                           entry, tp->rx_ring[entry].status);
        /* If we own the next entry, it is a new packet. Send it up. */
        while ( ! (tp->rx_ring[entry].status & cpu_to_le32(DescOwned))) {
                s32 status = le32_to_cpu(tp->rx_ring[entry].status);
                short pkt_len;
                if (tulip_debug > 5)
-                        printk(KERN_DEBUG "%s: In tulip_rx(), entry %d %08x\n",
+                        netdev_dbg(dev, "In tulip_rx(), entry %d %08x\n",
-                               dev->name, entry, status);
+                                   entry, status);
                if (--rx_work_limit < 0)
                        break;
@@ -401,23 +404,26 @@ static int tulip_rx(struct net_device *dev)
                                /* Ingore earlier buffers. */
                                if ((status & 0xffff) != 0x7fff) {
                                        if (tulip_debug > 1)
-                                                dev_warn(&dev->dev,
+                                                netdev_warn(dev,
-                                                         "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
+                                                            "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
-                                                         status);
+                                                            status);
-                                        tp->stats.rx_length_errors++;
+                                        dev->stats.rx_length_errors++;
                                }
                        } else {
                                /* There was a fatal error. */
                                if (tulip_debug > 2)
-                                        printk(KERN_DEBUG "%s: Receive error, Rx status %08x\n",
+                                        netdev_dbg(dev, "Receive error, Rx status %08x\n",
-                                               dev->name, status);
+                                                   status);
-                                tp->stats.rx_errors++; /* end of a packet.*/
+                                dev->stats.rx_errors++; /* end of a packet.*/
                                if (pkt_len > 1518 ||
                                    (status & RxDescRunt))
-                                        tp->stats.rx_length_errors++;
+                                        dev->stats.rx_length_errors++;
-                                if (status & 0x0004) tp->stats.rx_frame_errors++;
+                                if (status & 0x0004)
-                                if (status & 0x0002) tp->stats.rx_crc_errors++;
+                                        dev->stats.rx_frame_errors++;
-                                if (status & 0x0001) tp->stats.rx_fifo_errors++;
+                                if (status & 0x0002)
+                                        dev->stats.rx_crc_errors++;
+                                if (status & 0x0001)
+                                        dev->stats.rx_fifo_errors++;
                        }
                } else {
                        struct sk_buff *skb;
@@ -467,8 +473,8 @@ static int tulip_rx(struct net_device *dev)
                        netif_rx(skb);
-                        tp->stats.rx_packets++;
+                        dev->stats.rx_packets++;
-                        tp->stats.rx_bytes += pkt_len;
+                        dev->stats.rx_bytes += pkt_len;
                }
                received++;
                entry = (++tp->cur_rx) % RX_RING_SIZE;
@@ -567,8 +573,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
 #endif /*  CONFIG_TULIP_NAPI */
                if (tulip_debug > 4)
-                        printk(KERN_DEBUG "%s: interrupt  csr5=%#8.8x new csr5=%#8.8x\n",
+                        netdev_dbg(dev, "interrupt  csr5=%#8.8x new csr5=%#8.8x\n",
-                               dev->name, csr5, ioread32(ioaddr + CSR5));
+                                   csr5, ioread32(ioaddr + CSR5));
                if (csr5 & (TxNoBuf | TxDied | TxIntr | TimerInt)) {
@@ -599,21 +605,25 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
                                        /* There was an major error, log it. */
 #ifndef final_version
                                        if (tulip_debug > 1)
-                                                printk(KERN_DEBUG "%s: Transmit error, Tx status %08x\n",
+                                                netdev_dbg(dev, "Transmit error, Tx status %08x\n",
-                                                       dev->name, status);
+                                                           status);
 #endif
-                                        tp->stats.tx_errors++;
+                                        dev->stats.tx_errors++;
-                                        if (status & 0x4104) tp->stats.tx_aborted_errors++;
+                                        if (status & 0x4104)
-                                        if (status & 0x0C00) tp->stats.tx_carrier_errors++;
+                                                dev->stats.tx_aborted_errors++;
-                                        if (status & 0x0200) tp->stats.tx_window_errors++;
+                                        if (status & 0x0C00)
-                                        if (status & 0x0002) tp->stats.tx_fifo_errors++;
+                                                dev->stats.tx_carrier_errors++;
+                                        if (status & 0x0200)
+                                                dev->stats.tx_window_errors++;
+                                        if (status & 0x0002)
+                                                dev->stats.tx_fifo_errors++;
                                        if ((status & 0x0080) && tp->full_duplex == 0)
-                                                tp->stats.tx_heartbeat_errors++;
+                                                dev->stats.tx_heartbeat_errors++;
                                } else {
-                                        tp->stats.tx_bytes +=
+                                        dev->stats.tx_bytes +=
                                                tp->tx_buffers[entry].skb->len;
-                                        tp->stats.collisions += (status >> 3) & 15;
+                                        dev->stats.collisions += (status >> 3) & 15;
-                                        tp->stats.tx_packets++;
+                                        dev->stats.tx_packets++;
                                }
                                pci_unmap_single(tp->pdev, tp->tx_buffers[entry].mapping,
@@ -655,7 +665,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
                if (csr5 & AbnormalIntr) {      /* Abnormal error summary bit. */
                        if (csr5 == 0xffffffff)
                                break;
-                        if (csr5 & TxJabber) tp->stats.tx_errors++;
+                        if (csr5 & TxJabber)
+                                dev->stats.tx_errors++;
                        if (csr5 & TxFIFOUnderflow) {
                                if ((tp->csr6 & 0xC000) != 0xC000)
                                        tp->csr6 += 0x4000;     /* Bump up the Tx threshold */
@@ -672,8 +683,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
                                }
                        }
                        if (csr5 & RxDied) {            /* Missed a Rx frame. */
-                                tp->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff;
+                                dev->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff;
-                                tp->stats.rx_errors++;
+                                dev->stats.rx_errors++;
                                tulip_start_rxtx(tp);
                        }
                        /*
@@ -789,12 +800,12 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
 #endif /* CONFIG_TULIP_NAPI */
        if ((missed = ioread32(ioaddr + CSR8) & 0x1ffff)) {
-                tp->stats.rx_dropped += missed & 0x10000 ? 0x10000 : missed;
+                dev->stats.rx_dropped += missed & 0x10000 ? 0x10000 : missed;
        }
        if (tulip_debug > 4)
-                printk(KERN_DEBUG "%s: exiting interrupt, csr5=%#04x\n",
+                netdev_dbg(dev, "exiting interrupt, csr5=%#04x\n",
-                       dev->name, ioread32(ioaddr + CSR5));
+                           ioread32(ioaddr + CSR5));
        return IRQ_HANDLED;
 }
diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c
index a0c770ee4b64..4bd13922875d 100644
--- a/drivers/net/tulip/media.c
+++ b/drivers/net/tulip/media.c
@@ -182,8 +182,8 @@ void tulip_select_media(struct net_device *dev, int startup)
                switch (mleaf->type) {
                case 0:                                 /* 21140 non-MII xcvr. */
                        if (tulip_debug > 1)
-                                printk(KERN_DEBUG "%s: Using a 21140 non-MII transceiver with control setting %02x\n",
+                                netdev_dbg(dev, "Using a 21140 non-MII transceiver with control setting %02x\n",
-                                       dev->name, p[1]);
+                                           p[1]);
                        dev->if_port = p[0];
                        if (startup)
                                iowrite32(mtable->csr12dir | 0x100, ioaddr + CSR12);
@@ -204,15 +204,14 @@ void tulip_select_media(struct net_device *dev, int startup)
                                struct medialeaf *rleaf = &mtable->mleaf[mtable->has_reset];
                                unsigned char *rst = rleaf->leafdata;
                                if (tulip_debug > 1)
-                                        printk(KERN_DEBUG "%s: Resetting the transceiver\n",
+                                        netdev_dbg(dev, "Resetting the transceiver\n");
-                                               dev->name);
                                for (i = 0; i < rst[0]; i++)
                                        iowrite32(get_u16(rst + 1 + (i<<1)) << 16, ioaddr + CSR15);
                        }
                        if (tulip_debug > 1)
-                                printk(KERN_DEBUG "%s: 21143 non-MII %s transceiver control %04x/%04x\n",
+                                netdev_dbg(dev, "21143 non-MII %s transceiver control %04x/%04x\n",
-                                       dev->name, medianame[dev->if_port],
+                                           medianame[dev->if_port],
-                                       setup[0], setup[1]);
+                                           setup[0], setup[1]);
                        if (p[0] & 0x40) {      /* SIA (CSR13-15) setup values are provided. */
                                csr13val = setup[0];
                                csr14val = setup[1];
@@ -239,8 +238,8 @@ void tulip_select_media(struct net_device *dev, int startup)
                                if (startup) iowrite32(csr13val, ioaddr + CSR13);
                        }
                        if (tulip_debug > 1)
-                                printk(KERN_DEBUG "%s:  Setting CSR15 to %08x/%08x\n",
+                                netdev_dbg(dev, "Setting CSR15 to %08x/%08x\n",
-                                       dev->name, csr15dir, csr15val);
+                                           csr15dir, csr15val);
                        if (mleaf->type == 4)
                                new_csr6 = 0x82020000 | ((setup[2] & 0x71) << 18);
                        else
@@ -316,9 +315,9 @@ void tulip_select_media(struct net_device *dev, int startup)
                                if (tp->mii_advertise == 0)
                                        tp->mii_advertise = tp->advertising[phy_num];
                                if (tulip_debug > 1)
-                                        printk(KERN_DEBUG "%s:  Advertising %04x on MII %d\n",
+                                        netdev_dbg(dev, " Advertising %04x on MII %d\n",
-                                               dev->name, tp->mii_advertise,
+                                                   tp->mii_advertise,
-                                               tp->phys[phy_num]);
+                                                   tp->phys[phy_num]);
                                tulip_mdio_write(dev, tp->phys[phy_num], 4, tp->mii_advertise);
                        }
                        break;
@@ -335,8 +334,7 @@ void tulip_select_media(struct net_device *dev, int startup)
                                struct medialeaf *rleaf = &mtable->mleaf[mtable->has_reset];
                                unsigned char *rst = rleaf->leafdata;
                                if (tulip_debug > 1)
-                                        printk(KERN_DEBUG "%s: Resetting the transceiver\n",
+                                        netdev_dbg(dev, "Resetting the transceiver\n");
-                                               dev->name);
                                for (i = 0; i < rst[0]; i++)
                                        iowrite32(get_u16(rst + 1 + (i<<1)) << 16, ioaddr + CSR15);
                        }
@@ -344,20 +342,21 @@ void tulip_select_media(struct net_device *dev, int startup)
                        break;
                }
                default:
-                        printk(KERN_DEBUG "%s:  Invalid media table selection %d\n",
+                        netdev_dbg(dev, " Invalid media table selection %d\n",
-                               dev->name, mleaf->type);
+                                   mleaf->type);
                        new_csr6 = 0x020E0000;
                }
                if (tulip_debug > 1)
-                        printk(KERN_DEBUG "%s: Using media type %s, CSR12 is %02x\n",
+                        netdev_dbg(dev, "Using media type %s, CSR12 is %02x\n",
-                               dev->name, medianame[dev->if_port],
+                                   medianame[dev->if_port],
                                   ioread32(ioaddr + CSR12) & 0xff);
        } else if (tp->chip_id == LC82C168) {
                if (startup && ! tp->medialock)
                        dev->if_port = tp->mii_cnt ? 11 : 0;
                if (tulip_debug > 1)
-                        printk(KERN_DEBUG "%s: PNIC PHY status is %3.3x, media %s\n",
+                        netdev_dbg(dev, "PNIC PHY status is %3.3x, media %s\n",
-                               dev->name, ioread32(ioaddr + 0xB8), medianame[dev->if_port]);
+                                   ioread32(ioaddr + 0xB8),
+                                   medianame[dev->if_port]);
                if (tp->mii_cnt) {
                        new_csr6 = 0x810C0000;
                        iowrite32(0x0001, ioaddr + CSR15);
@@ -388,9 +387,9 @@ void tulip_select_media(struct net_device *dev, int startup)
                } else
                        new_csr6 = 0x03860000;
                if (tulip_debug > 1)
-                        printk(KERN_DEBUG "%s: No media description table, assuming %s transceiver, CSR12 %02x\n",
+                        netdev_dbg(dev, "No media description table, assuming %s transceiver, CSR12 %02x\n",
-                               dev->name, medianame[dev->if_port],
+                                   medianame[dev->if_port],
-                               ioread32(ioaddr + CSR12));
+                                   ioread32(ioaddr + CSR12));
        }
        tp->csr6 = new_csr6 | (tp->csr6 & 0xfdff) | (tp->full_duplex ? 0x0200 : 0);
@@ -504,8 +503,8 @@ void __devinit tulip_find_mii (struct net_device *dev, int board_idx)
                /* Fixup for DLink with miswired PHY. */
                if (mii_advert != to_advert) {
-                        printk(KERN_DEBUG "tulip%d:  Advertising %04x on PHY %d, previously advertising %04x\n",
+                        pr_debug("tulip%d:  Advertising %04x on PHY %d, previously advertising %04x\n",
-                               board_idx, to_advert, phy, mii_advert);
+                                 board_idx, to_advert, phy, mii_advert);
                        tulip_mdio_write (dev, phy, 4, to_advert);
                }
diff --git a/drivers/net/tulip/pnic.c b/drivers/net/tulip/pnic.c
index a63e64b6863d..aa4d9dad0395 100644
--- a/drivers/net/tulip/pnic.c
+++ b/drivers/net/tulip/pnic.c
@@ -40,8 +40,8 @@ void pnic_do_nway(struct net_device *dev)
                        new_csr6 |= 0x00000200;
                }
                if (tulip_debug > 1)
-                        printk(KERN_DEBUG "%s: PNIC autonegotiated status %08x, %s\n",
+                        netdev_dbg(dev, "PNIC autonegotiated status %08x, %s\n",
-                               dev->name, phy_reg, medianame[dev->if_port]);
+                                   phy_reg, medianame[dev->if_port]);
                if (tp->csr6 != new_csr6) {
                        tp->csr6 = new_csr6;
                        /* Restart Tx */
@@ -58,8 +58,8 @@ void pnic_lnk_change(struct net_device *dev, int csr5)
        int phy_reg = ioread32(ioaddr + 0xB8);
        if (tulip_debug > 1)
-                printk(KERN_DEBUG "%s: PNIC link changed state %08x, CSR5 %08x\n",
+                netdev_dbg(dev, "PNIC link changed state %08x, CSR5 %08x\n",
-                       dev->name, phy_reg, csr5);
+                           phy_reg, csr5);
        if (ioread32(ioaddr + CSR5) & TPLnkFail) {
                iowrite32((ioread32(ioaddr + CSR7) & ~TPLnkFail) | TPLnkPass, ioaddr + CSR7);
                /* If we use an external MII, then we mustn't use the
@@ -114,8 +114,8 @@ void pnic_timer(unsigned long data)
                int csr5 = ioread32(ioaddr + CSR5);
                if (tulip_debug > 1)
-                        printk(KERN_DEBUG "%s: PNIC timer PHY status %08x, %s CSR5 %08x\n",
+                        netdev_dbg(dev, "PNIC timer PHY status %08x, %s CSR5 %08x\n",
-                               dev->name, phy_reg, medianame[dev->if_port], csr5);
+                                   phy_reg, medianame[dev->if_port], csr5);
                if (phy_reg & 0x04000000) {     /* Remote link fault */
                        iowrite32(0x0201F078, ioaddr + 0xB8);
                        next_tick = 1*HZ;
@@ -125,11 +125,11 @@ void pnic_timer(unsigned long data)
                        next_tick = 60*HZ;
                } else if (csr5 & TPLnkFail) { /* 100baseTx link beat */
                        if (tulip_debug > 1)
-                                printk(KERN_DEBUG "%s: %s link beat failed, CSR12 %04x, CSR5 %08x, PHY %03x\n",
+                                netdev_dbg(dev, "%s link beat failed, CSR12 %04x, CSR5 %08x, PHY %03x\n",
-                                       dev->name, medianame[dev->if_port],
+                                           medianame[dev->if_port],
-                                       csr12,
+                                           csr12,
-                                       ioread32(ioaddr + CSR5),
+                                           ioread32(ioaddr + CSR5),
-                                       ioread32(ioaddr + 0xB8));
+                                           ioread32(ioaddr + 0xB8));
                        next_tick = 3*HZ;
                        if (tp->medialock) {
                        } else if (tp->nwayset  &&  (dev->if_port & 1)) {
diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/tulip/pnic2.c
index b8197666021e..93358ee4d830 100644
--- a/drivers/net/tulip/pnic2.c
+++ b/drivers/net/tulip/pnic2.c
@@ -59,7 +59,7 @@
 * Bit 14:12 - autonegotiation state (write 001 to start autonegotiate)
 * Bit 3     - Autopolarity state
 * Bit 2     - LS10B - link state of 10baseT 0 - good, 1 - failed
- * Bit 1     - LS100B - link state of 100baseT 0 - good, 1- faild
+ * Bit 1     - LS100B - link state of 100baseT 0 - good, 1 - failed
 *
 *
 * Data Port Selection Info
@@ -125,8 +125,8 @@ void pnic2_start_nway(struct net_device *dev)
        csr14 |= 0x00001184;
        if (tulip_debug > 1)
-                printk(KERN_DEBUG "%s: Restarting PNIC2 autonegotiation, csr14=%08x\n",
+                netdev_dbg(dev, "Restarting PNIC2 autonegotiation, csr14=%08x\n",
-                       dev->name, csr14);
+                           csr14);
        /* tell pnic2_lnk_change we are doing an nway negotiation */
        dev->if_port = 0;
@@ -137,8 +137,7 @@ void pnic2_start_nway(struct net_device *dev)
        tp->csr6 = ioread32(ioaddr + CSR6);
        if (tulip_debug > 1)
-                printk(KERN_DEBUG "%s: On Entry to Nway, csr6=%08x\n",
+                netdev_dbg(dev, "On Entry to Nway, csr6=%08x\n", tp->csr6);
-                       dev->name, tp->csr6);
        /* mask off any bits not to touch
         * comment at top of file explains mask value
@@ -271,9 +270,10 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)
                        iowrite32(1, ioaddr + CSR13);
                        if (tulip_debug > 2)
-                                printk(KERN_DEBUG "%s: Setting CSR6 %08x/%x CSR12 %08x\n",
+                                netdev_dbg(dev, "Setting CSR6 %08x/%x CSR12 %08x\n",
-                                       dev->name, tp->csr6,
+                                           tp->csr6,
-                                       ioread32(ioaddr + CSR6), ioread32(ioaddr + CSR12));
+                                           ioread32(ioaddr + CSR6),
+                                           ioread32(ioaddr + CSR12));
                        /* now the following actually writes out the
                         * new csr6 values
@@ -324,7 +324,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)
                /* Link blew? Maybe restart NWay. */
                if (tulip_debug > 2)
-                        printk(KERN_DEBUG "%s: Ugh! Link blew?\n", dev->name);
+                        netdev_dbg(dev, "Ugh! Link blew?\n");
                del_timer_sync(&tp->timer);
                pnic2_start_nway(dev);
diff --git a/drivers/net/tulip/timer.c b/drivers/net/tulip/timer.c
index 36c2725ec886..2017faf2d0e6 100644
--- a/drivers/net/tulip/timer.c
+++ b/drivers/net/tulip/timer.c
@@ -28,11 +28,11 @@ void tulip_media_task(struct work_struct *work)
        unsigned long flags;
        if (tulip_debug > 2) {
-                printk(KERN_DEBUG "%s: Media selection tick, %s, status %08x mode %08x SIA %08x %08x %08x %08x\n",
+                netdev_dbg(dev, "Media selection tick, %s, status %08x mode %08x SIA %08x %08x %08x %08x\n",
-                       dev->name, medianame[dev->if_port],
+                           medianame[dev->if_port],
-                       ioread32(ioaddr + CSR5), ioread32(ioaddr + CSR6),
+                           ioread32(ioaddr + CSR5), ioread32(ioaddr + CSR6),
-                       csr12, ioread32(ioaddr + CSR13),
+                           csr12, ioread32(ioaddr + CSR13),
-                       ioread32(ioaddr + CSR14), ioread32(ioaddr + CSR15));
+                           ioread32(ioaddr + CSR14), ioread32(ioaddr + CSR15));
        }
        switch (tp->chip_id) {
        case DC21140:
@@ -48,9 +48,9 @@ void tulip_media_task(struct work_struct *work)
                           Assume this a generic MII or SYM transceiver. */
                        next_tick = 60*HZ;
                        if (tulip_debug > 2)
-                                printk(KERN_DEBUG "%s: network media monitor CSR6 %08x CSR12 0x%02x\n",
+                                netdev_dbg(dev, "network media monitor CSR6 %08x CSR12 0x%02x\n",
-                                       dev->name,
+                                           ioread32(ioaddr + CSR6),
-                                       ioread32(ioaddr + CSR6), csr12 & 0xff);
+                                           csr12 & 0xff);
                        break;
                }
                mleaf = &tp->mtable->mleaf[tp->cur_index];
@@ -62,8 +62,8 @@ void tulip_media_task(struct work_struct *work)
                        s8 bitnum = p[offset];
                        if (p[offset+1] & 0x80) {
                                if (tulip_debug > 1)
-                                        printk(KERN_DEBUG "%s: Transceiver monitor tick CSR12=%#02x, no media sense\n",
+                                        netdev_dbg(dev, "Transceiver monitor tick CSR12=%#02x, no media sense\n",
-                                               dev->name, csr12);
+                                                   csr12);
                                if (mleaf->type == 4) {
                                        if (mleaf->media == 3 && (csr12 & 0x02))
                                                goto select_next_media;
@@ -71,17 +71,16 @@ void tulip_media_task(struct work_struct *work)
                                break;
                        }
                        if (tulip_debug > 2)
-                                printk(KERN_DEBUG "%s: Transceiver monitor tick: CSR12=%#02x bit %d is %d, expecting %d\n",
+                                netdev_dbg(dev, "Transceiver monitor tick: CSR12=%#02x bit %d is %d, expecting %d\n",
-                                       dev->name, csr12, (bitnum >> 1) & 7,
+                                           csr12, (bitnum >> 1) & 7,
-                                       (csr12 & (1 << ((bitnum >> 1) & 7))) != 0,
+                                           (csr12 & (1 << ((bitnum >> 1) & 7))) != 0,
-                                       (bitnum >= 0));
+                                           (bitnum >= 0));
                        /* Check that the specified bit has the proper value. */
                        if ((bitnum < 0) !=
                                ((csr12 & (1 << ((bitnum >> 1) & 7))) != 0)) {
                                if (tulip_debug > 2)
-                                        printk(KERN_DEBUG "%s: Link beat detected for %s\n",
+                                        netdev_dbg(dev, "Link beat detected for %s\n",
-                                               dev->name,
+                                                   medianame[mleaf->media & MEDIA_MASK]);
-                                               medianame[mleaf->media & MEDIA_MASK]);
                                if ((p[2] & 0x61) == 0x01)      /* Bogus Znyx board. */
                                        goto actually_mii;
                                netif_carrier_on(dev);
@@ -99,10 +98,9 @@ void tulip_media_task(struct work_struct *work)
                        if (tulip_media_cap[dev->if_port] & MediaIsFD)
                                goto select_next_media; /* Skip FD entries. */
                        if (tulip_debug > 1)
-                                printk(KERN_DEBUG "%s: No link beat on media %s, trying transceiver type %s\n",
+                                netdev_dbg(dev, "No link beat on media %s, trying transceiver type %s\n",
-                                       dev->name,
+                                           medianame[mleaf->media & MEDIA_MASK],
-                                       medianame[mleaf->media & MEDIA_MASK],
+                                           medianame[tp->mtable->mleaf[tp->cur_index].media]);
-                                       medianame[tp->mtable->mleaf[tp->cur_index].media]);
                        tulip_select_media(dev, 0);
                        /* Restart the transmit process. */
                        tulip_restart_rxtx(tp);
@@ -166,10 +164,9 @@ void comet_timer(unsigned long data)
        int next_tick = 60*HZ;
        if (tulip_debug > 1)
-                printk(KERN_DEBUG "%s: Comet link status %04x partner capability %04x\n",
+                netdev_dbg(dev, "Comet link status %04x partner capability %04x\n",
-                       dev->name,
+                           tulip_mdio_read(dev, tp->phys[0], 1),
-                       tulip_mdio_read(dev, tp->phys[0], 1),
+                           tulip_mdio_read(dev, tp->phys[0], 5));
-                       tulip_mdio_read(dev, tp->phys[0], 5));
        /* mod_timer synchronizes us with potential add_timer calls
         * from interrupts.
         */
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index e525875ed67d..9db528967da9 100644
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -417,7 +417,6 @@ struct tulip_private {
        int revision;
        int flags;
        struct napi_struct napi;
-        struct net_device_stats stats;
        struct timer_list timer;        /* Media selection timer. */
        struct timer_list oom_timer;    /* Out of memory timer. */
        u32 mc_filter[2];
@@ -548,11 +547,9 @@ static inline void tulip_stop_rxtx(struct tulip_private *tp)
                        udelay(10);
                if (!i)
-                        printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed"
+                        netdev_dbg(tp->dev, "tulip_stop_rxtx() failed (CSR5 0x%x CSR6 0x%x)\n",
-                                        " (CSR5 0x%x CSR6 0x%x)\n",
+                                   ioread32(ioaddr + CSR5),
-                                        pci_name(tp->pdev),
+                                   ioread32(ioaddr + CSR6));
-                                        ioread32(ioaddr + CSR5),
-                                        ioread32(ioaddr + CSR6));
        }
 }
@@ -570,7 +567,7 @@ static inline void tulip_tx_timeout_complete(struct tulip_private *tp, void __io
        /* Trigger an immediate transmit demand. */
        iowrite32(0, ioaddr + CSR1);
-        tp->stats.tx_errors++;
+        tp->dev->stats.tx_errors++;
 }
 #endif /* __NET_TULIP_H__ */
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 3a8d7efa2acf..82f87647207e 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -12,6 +12,7 @@
        Please submit bugs to http://bugzilla.kernel.org/ .
 */
+#define pr_fmt(fmt) "tulip: " fmt
 #define DRV_NAME        "tulip"
 #ifdef CONFIG_TULIP_NAPI
@@ -119,8 +120,6 @@ module_param(csr0, int, 0);
 module_param_array(options, int, NULL, 0);
 module_param_array(full_duplex, int, NULL, 0);
-#define PFX DRV_NAME ": "
 #ifdef TULIP_DEBUG
 int tulip_debug = TULIP_DEBUG;
 #else
@@ -331,8 +330,7 @@ static void tulip_up(struct net_device *dev)
        udelay(100);
        if (tulip_debug > 1)
-                printk(KERN_DEBUG "%s: tulip_up(), irq==%d\n",
+                netdev_dbg(dev, "tulip_up(), irq==%d\n", dev->irq);
-                       dev->name, dev->irq);
        iowrite32(tp->rx_ring_dma, ioaddr + CSR3);
        iowrite32(tp->tx_ring_dma, ioaddr + CSR4);
@@ -499,10 +497,10 @@ media_picked:
        iowrite32(0, ioaddr + CSR2);            /* Rx poll demand */
        if (tulip_debug > 2) {
-                printk(KERN_DEBUG "%s: Done tulip_up(), CSR0 %08x, CSR5 %08x CSR6 %08x\n",
+                netdev_dbg(dev, "Done tulip_up(), CSR0 %08x, CSR5 %08x CSR6 %08x\n",
-                       dev->name, ioread32(ioaddr + CSR0),
+                           ioread32(ioaddr + CSR0),
-                       ioread32(ioaddr + CSR5),
+                           ioread32(ioaddr + CSR5),
-                       ioread32(ioaddr + CSR6));
+                           ioread32(ioaddr + CSR6));
        }
        /* Set the timer to switch to check for link beat and perhaps switch
@@ -725,7 +723,7 @@ static void tulip_clean_tx_ring(struct tulip_private *tp)
                int status = le32_to_cpu(tp->tx_ring[entry].status);
                if (status < 0) {
-                        tp->stats.tx_errors++;  /* It wasn't Txed */
+                        tp->dev->stats.tx_errors++;     /* It wasn't Txed */
                        tp->tx_ring[entry].status = 0;
                }
@@ -781,8 +779,8 @@ static void tulip_down (struct net_device *dev)
        /* release any unconsumed transmit buffers */
        tulip_clean_tx_ring(tp);
-        if (ioread32 (ioaddr + CSR6) != 0xffffffff)
+        if (ioread32(ioaddr + CSR6) != 0xffffffff)
-                tp->stats.rx_missed_errors += ioread32 (ioaddr + CSR8) & 0xffff;
+                dev->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff;
        spin_unlock_irqrestore (&tp->lock, flags);
@@ -843,8 +841,7 @@ static int tulip_close (struct net_device *dev)
        tulip_down (dev);
        if (tulip_debug > 1)
-                dev_printk(KERN_DEBUG, &dev->dev,
+                netdev_dbg(dev, "Shutting down ethercard, status was %02x\n",
-                           "Shutting down ethercard, status was %02x\n",
                           ioread32 (ioaddr + CSR5));
        free_irq (dev->irq, dev);
@@ -864,12 +861,12 @@ static struct net_device_stats *tulip_get_stats(struct net_device *dev)
                spin_lock_irqsave (&tp->lock, flags);
-                tp->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff;
+                dev->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff;
                spin_unlock_irqrestore(&tp->lock, flags);
        }
-        return &tp->stats;
+        return &dev->stats;
 }
@@ -1207,7 +1204,7 @@ static void __devinit tulip_mwi_config (struct pci_dev *pdev,
        u32 csr0;
        if (tulip_debug > 3)
-                printk(KERN_DEBUG "%s: tulip_mwi_config()\n", pci_name(pdev));
+                netdev_dbg(dev, "tulip_mwi_config()\n");
        tp->csr0 = csr0 = 0;
@@ -1269,8 +1266,8 @@ static void __devinit tulip_mwi_config (struct pci_dev *pdev,
 out:
        tp->csr0 = csr0;
        if (tulip_debug > 2)
-                printk(KERN_DEBUG "%s: MWI config cacheline=%d, csr0=%08x\n",
+                netdev_dbg(dev, "MWI config cacheline=%d, csr0=%08x\n",
-                       pci_name(pdev), cache, csr0);
+                           cache, csr0);
 }
 #endif
@@ -1302,17 +1299,18 @@ static const struct net_device_ops tulip_netdev_ops = {
 #endif
 };
+DEFINE_PCI_DEVICE_TABLE(early_486_chipsets) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82424) },
+        { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496) },
+        { },
+};
 static int __devinit tulip_init_one (struct pci_dev *pdev,
                                     const struct pci_device_id *ent)
 {
        struct tulip_private *tp;
        /* See note below on the multiport cards. */
        static unsigned char last_phys_addr[6] = {0x00, 'L', 'i', 'n', 'u', 'x'};
-        static struct pci_device_id early_486_chipsets[] = {
-                { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82424) },
-                { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496) },
-                { },
-        };
        static int last_irq;
        static int multiport_cnt;       /* For four-port boards w/one EEPROM */
        int i, irq;
@@ -1339,13 +1337,13 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
         */
        if (pdev->subsystem_vendor == PCI_VENDOR_ID_LMC) {
-                pr_err(PFX "skipping LMC card\n");
+                pr_err("skipping LMC card\n");
                return -ENODEV;
        } else if (pdev->subsystem_vendor == PCI_VENDOR_ID_SBE &&
                   (pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_T3E3 ||
                    pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_2T3E3_P0 ||
                    pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_2T3E3_P1)) {
-                pr_err(PFX "skipping SBE T3E3 port\n");
+                pr_err("skipping SBE T3E3 port\n");
                return -ENODEV;
        }
@@ -1361,13 +1359,13 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
                if (pdev->vendor == 0x1282 && pdev->device == 0x9100 &&
                    pdev->revision < 0x30) {
-                        pr_info(PFX "skipping early DM9100 with Crc bug (use dmfe)\n");
+                        pr_info("skipping early DM9100 with Crc bug (use dmfe)\n");
                        return -ENODEV;
                }
                dp = pci_device_to_OF_node(pdev);
                if (!(dp && of_get_property(dp, "local-mac-address", NULL))) {
-                        pr_info(PFX "skipping DM910x expansion card (use dmfe)\n");
+                        pr_info("skipping DM910x expansion card (use dmfe)\n");
                        return -ENODEV;
                }
        }
@@ -1414,16 +1412,14 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
        i = pci_enable_device(pdev);
        if (i) {
-                pr_err(PFX "Cannot enable tulip board #%d, aborting\n",
+                pr_err("Cannot enable tulip board #%d, aborting\n", board_idx);
-                       board_idx);
                return i;
        }
        /* The chip will fail to enter a low-power state later unless
         * first explicitly commanded into D0 */
        if (pci_set_power_state(pdev, PCI_D0)) {
-                printk (KERN_NOTICE PFX
+                pr_notice("Failed to set power state to D0\n");
-                        "Failed to set power state to D0\n");
        }
        irq = pdev->irq;
@@ -1431,13 +1427,13 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
        /* alloc_etherdev ensures aligned and zeroed private structures */
        dev = alloc_etherdev (sizeof (*tp));
        if (!dev) {
-                pr_err(PFX "ether device alloc failed, aborting\n");
+                pr_err("ether device alloc failed, aborting\n");
                return -ENOMEM;
        }
        SET_NETDEV_DEV(dev, &pdev->dev);
        if (pci_resource_len (pdev, 0) < tulip_tbl[chip_idx].io_size) {
-                pr_err(PFX "%s: I/O region (0x%llx@0x%llx) too small, aborting\n",
+                pr_err("%s: I/O region (0x%llx@0x%llx) too small, aborting\n",
                       pci_name(pdev),
                       (unsigned long long)pci_resource_len (pdev, 0),
                       (unsigned long long)pci_resource_start (pdev, 0));
@@ -1482,7 +1478,8 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
                if (sig == 0x09811317) {
                        tp->flags |= COMET_PM;
                        tp->wolinfo.supported = WAKE_PHY | WAKE_MAGIC;
-                        printk(KERN_INFO "tulip_init_one: Enabled WOL support for AN983B\n");
+                        pr_info("%s: Enabled WOL support for AN983B\n",
+                                __func__);
                }
        }
        tp->pdev = pdev;
@@ -1682,7 +1679,9 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
                tp->full_duplex_lock = 1;
        if (tulip_media_cap[tp->default_port] & MediaIsMII) {
-                u16 media2advert[] = { 0x20, 0x40, 0x03e0, 0x60, 0x80, 0x100, 0x200 };
+                static const u16 media2advert[] = {
+                        0x20, 0x40, 0x03e0, 0x60, 0x80, 0x100, 0x200
+                };
                tp->mii_advertise = media2advert[tp->default_port - 9];
                tp->mii_advertise |= (tp->flags & HAS_8023X); /* Matching bits! */
        }
@@ -1876,7 +1875,7 @@ save_state:
                tulip_set_wolopts(pdev, tp->wolinfo.wolopts);
                rc = pci_enable_wake(pdev, pstate, tp->wolinfo.wolopts);
                if (rc)
-                        printk("tulip: pci_enable_wake failed (%d)\n", rc);
+                        pr_err("pci_enable_wake failed (%d)\n", rc);
        }
        pci_set_power_state(pdev, pstate);
@@ -1902,12 +1901,12 @@ static int tulip_resume(struct pci_dev *pdev)
                return 0;
        if ((retval = pci_enable_device(pdev))) {
-                pr_err(PFX "pci_enable_device failed in resume\n");
+                pr_err("pci_enable_device failed in resume\n");
                return retval;
        }
        if ((retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev))) {
-                pr_err(PFX "request_irq failed in resume\n");
+                pr_err("request_irq failed in resume\n");
                return retval;
        }
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 96de5829b940..9e63f406f72d 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -209,8 +209,7 @@ enum uli526x_CR6_bits {
 /* Global variable declaration ----------------------------- */
 static int __devinitdata printed_version;
 static const char version[] __devinitconst =
-        KERN_INFO DRV_NAME ": ULi M5261/M5263 net driver, version "
+        "ULi M5261/M5263 net driver, version " DRV_VERSION " (" DRV_RELDATE ")";
-        DRV_VERSION " (" DRV_RELDATE ")\n";
 static int uli526x_debug;
 static unsigned char uli526x_media_mode = ULI526X_AUTO;
@@ -283,7 +282,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
        ULI526X_DBUG(0, "uli526x_init_one()", 0);
        if (!printed_version++)
-                printk(version);
+                pr_info("%s\n", version);
        /* Init network device */
        dev = alloc_etherdev(sizeof(*db));
@@ -292,7 +291,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
        SET_NETDEV_DEV(dev, &pdev->dev);
        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
-                pr_warning("32-bit PCI DMA not available\n");
+                pr_warn("32-bit PCI DMA not available\n");
                err = -ENODEV;
                goto err_out_free;
        }
@@ -390,9 +389,9 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
        if (err)
                goto err_out_res;
-        dev_info(&dev->dev, "ULi M%04lx at pci%s, %pM, irq %d\n",
+        netdev_info(dev, "ULi M%04lx at pci%s, %pM, irq %d\n",
-                 ent->driver_data >> 16, pci_name(pdev),
+                    ent->driver_data >> 16, pci_name(pdev),
-                 dev->dev_addr, dev->irq);
+                    dev->dev_addr, dev->irq);
        pci_set_master(pdev);
@@ -480,7 +479,7 @@ static int uli526x_open(struct net_device *dev)
        init_timer(&db->timer);
        db->timer.expires = ULI526X_TIMER_WUT + HZ * 2;
        db->timer.data = (unsigned long)dev;
-        db->timer.function = &uli526x_timer;
+        db->timer.function = uli526x_timer;
        add_timer(&db->timer);
        return 0;
@@ -524,7 +523,7 @@ static void uli526x_init(struct net_device *dev)
                }
        }
        if(phy_tmp == 32)
-                pr_warning("Can not find the phy address!!!");
+                pr_warn("Can not find the phy address!!!\n");
        /* Parser SROM and media mode */
        db->media_mode = uli526x_media_mode;
@@ -590,7 +589,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
        /* Too large packet check */
        if (skb->len > MAX_PACKET_SIZE) {
-                pr_err("big packet = %d\n", (u16)skb->len);
+                netdev_err(dev, "big packet = %d\n", (u16)skb->len);
                dev_kfree_skb(skb);
                return NETDEV_TX_OK;
        }
@@ -600,7 +599,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
        /* No Tx resource check, it never happen nromally */
        if (db->tx_packet_cnt >= TX_FREE_DESC_CNT) {
                spin_unlock_irqrestore(&db->lock, flags);
-                pr_err("No Tx resource %ld\n", db->tx_packet_cnt);
+                netdev_err(dev, "No Tx resource %ld\n", db->tx_packet_cnt);
                return NETDEV_TX_BUSY;
        }
@@ -667,15 +666,6 @@ static int uli526x_stop(struct net_device *dev)
        /* free allocated rx buffer */
        uli526x_free_rxbuffer(db);
-#if 0
-        /* show statistic counter */
-        printk(DRV_NAME ": FU:%lx EC:%lx LC:%lx NC:%lx LOC:%lx TXJT:%lx RESET:%lx RCR8:%lx FAL:%lx TT:%lx\n",
-                db->tx_fifo_underrun, db->tx_excessive_collision,
-                db->tx_late_collision, db->tx_no_carrier, db->tx_loss_carrier,
-                db->tx_jabber_timeout, db->reset_count, db->reset_cr8,
-                db->reset_fatal, db->reset_TXtimeout);
-#endif
        return 0;
 }
@@ -755,7 +745,6 @@ static void uli526x_free_tx_pkt(struct net_device *dev,
        txptr = db->tx_remove_ptr;
        while(db->tx_packet_cnt) {
                tdes0 = le32_to_cpu(txptr->tdes0);
-                /* printk(DRV_NAME ": tdes0=%x\n", tdes0); */
                if (tdes0 & 0x80000000)
                        break;
@@ -765,7 +754,6 @@ static void uli526x_free_tx_pkt(struct net_device *dev,
                /* Transmit statistic counter */
                if ( tdes0 != 0x7fffffff ) {
-                        /* printk(DRV_NAME ": tdes0=%x\n", tdes0); */
                        dev->stats.collisions += (tdes0 >> 3) & 0xf;
                        dev->stats.tx_bytes += le32_to_cpu(txptr->tdes1) & 0x7ff;
                        if (tdes0 & TDES0_ERR_MASK) {
@@ -838,7 +826,6 @@ static void uli526x_rx_packet(struct net_device *dev, struct uli526x_board_info
                        /* error summary bit check */
                        if (rdes0 & 0x8000) {
                                /* This is a error packet */
-                                //printk(DRV_NAME ": rdes0: %lx\n", rdes0);
                                dev->stats.rx_errors++;
                                if (rdes0 & 1)
                                        dev->stats.rx_fifo_errors++;
@@ -945,12 +932,12 @@ ULi_ethtool_gset(struct uli526x_board_info *db, struct ethtool_cmd *ecmd)
        ecmd->transceiver = XCVR_EXTERNAL;
-        ecmd->speed = 10;
+        ethtool_cmd_speed_set(ecmd, SPEED_10);
        ecmd->duplex = DUPLEX_HALF;
        if(db->op_mode==ULI526X_100MHF || db->op_mode==ULI526X_100MFD)
        {
-                ecmd->speed = 100;
+                ethtool_cmd_speed_set(ecmd, SPEED_100);
        }
        if(db->op_mode==ULI526X_10MFD || db->op_mode==ULI526X_100MFD)
        {
@@ -958,7 +945,7 @@ ULi_ethtool_gset(struct uli526x_board_info *db, struct ethtool_cmd *ecmd)
        }
        if(db->link_failed)
        {
-                ecmd->speed = -1;
+                ethtool_cmd_speed_set(ecmd, -1);
                ecmd->duplex = -1;
        }
@@ -1024,7 +1011,6 @@ static void uli526x_timer(unsigned long data)
        struct net_device *dev = (struct net_device *) data;
        struct uli526x_board_info *db = netdev_priv(dev);
        unsigned long flags;
-        u8 TmpSpeed=10;
        //ULI526X_DBUG(0, "uli526x_timer()", 0);
        spin_lock_irqsave(&db->lock, flags);
@@ -1047,8 +1033,7 @@ static void uli526x_timer(unsigned long data)
                if ( time_after(jiffies, dev_trans_start(dev) + ULI526X_TX_TIMEOUT) ) {
                        db->reset_TXtimeout++;
                        db->wait_reset = 1;
-                        printk( "%s: Tx timeout - resetting\n",
+                        netdev_err(dev, " Tx timeout - resetting\n");
-                               dev->name);
                }
        }
@@ -1070,7 +1055,7 @@ static void uli526x_timer(unsigned long data)
                /* Link Failed */
                ULI526X_DBUG(0, "Link Failed", tmp_cr12);
                netif_carrier_off(dev);
-                pr_info("%s NIC Link is Down\n",dev->name);
+                netdev_info(dev, "NIC Link is Down\n");
                db->link_failed = 1;
                /* For Force 10/100M Half/Full mode: Enable Auto-Nego mode */
@@ -1096,18 +1081,13 @@ static void uli526x_timer(unsigned long data)
                        if(db->link_failed==0)
                        {
-                                if(db->op_mode==ULI526X_100MHF || db->op_mode==ULI526X_100MFD)
+                                netdev_info(dev, "NIC Link is Up %d Mbps %s duplex\n",
-                                {
+                                            (db->op_mode == ULI526X_100MHF ||
-                                        TmpSpeed = 100;
+                                             db->op_mode == ULI526X_100MFD)
-                                }
+                                            ? 100 : 10,
-                                if(db->op_mode==ULI526X_10MFD || db->op_mode==ULI526X_100MFD)
+                                            (db->op_mode == ULI526X_10MFD ||
-                                {
+                                             db->op_mode == ULI526X_100MFD)
-                                        pr_info("%s NIC Link is Up %d Mbps Full duplex\n",dev->name,TmpSpeed);
+                                            ? "Full" : "Half");
-                                }
-                                else
-                                {
-                                        pr_info("%s NIC Link is Up %d Mbps Half duplex\n",dev->name,TmpSpeed);
-                                }
                                netif_carrier_on(dev);
                        }
                        /* SHOW_MEDIA_TYPE(db->op_mode); */
@@ -1116,7 +1096,7 @@ static void uli526x_timer(unsigned long data)
                {
                        if(db->init==1)
                        {
-                                pr_info("%s NIC Link is Down\n",dev->name);
+                                netdev_info(dev, "NIC Link is Down\n");
                                netif_carrier_off(dev);
                        }
                }
@@ -1242,7 +1222,7 @@ static int uli526x_resume(struct pci_dev *pdev)
        err = pci_set_power_state(pdev, PCI_D0);
        if (err) {
-                dev_warn(&dev->dev, "Could not put device into D0\n");
+                netdev_warn(dev, "Could not put device into D0\n");
                return err;
        }
@@ -1443,7 +1423,7 @@ static void send_filter_frame(struct net_device *dev, int mc_cnt)
                update_cr6(db->cr6_data, dev->base_addr);
                dev->trans_start = jiffies;
        } else
-                pr_err("No Tx resource - Send_filter_frame!\n");
+                netdev_err(dev, "No Tx resource - Send_filter_frame!\n");
 }
@@ -1540,7 +1520,6 @@ static u8 uli526x_sense_speed(struct uli526x_board_info * db)
                else
                        phy_mode = 0x1000;
-                /* printk(DRV_NAME ": Phy_mode %x ",phy_mode); */
                switch (phy_mode) {
                case 0x1000: db->op_mode = ULI526X_10MHF; break;
                case 0x2000: db->op_mode = ULI526X_10MFD; break;
@@ -1747,7 +1726,7 @@ static u16 phy_readby_cr10(unsigned long iobase, u8 phy_addr, u8 offset)
                if(cr10_value&0x10000000)
                        break;
        }
-        return (cr10_value&0x0ffff);
+        return cr10_value & 0x0ffff;
 }
 static void phy_writeby_cr10(unsigned long iobase, u8 phy_addr, u8 offset, u16 phy_data)
@@ -1829,7 +1808,7 @@ MODULE_PARM_DESC(mode, "ULi M5261/M5263: Bit 0: 10/100Mbps, bit 2: duplex, bit 8
 static int __init uli526x_init_module(void)
 {
-        printk(version);
+        pr_info("%s\n", version);
        printed_version = 1;
        ULI526X_DBUG(0, "init_module() ", debug);
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 66d41cf8da29..862eadf07191 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -44,6 +44,8 @@
        * Wake-On-LAN
 */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #define DRV_NAME        "winbond-840"
 #define DRV_VERSION     "1.01-e"
 #define DRV_RELDATE     "Sep-11-2006"
@@ -139,7 +141,7 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
 /* These identify the driver base version and may not be removed. */
 static const char version[] __initconst =
-        KERN_INFO DRV_NAME ".c:v" DRV_VERSION " (2.4 port) "
+        "v" DRV_VERSION " (2.4 port) "
        DRV_RELDATE "  Donald Becker <becker@scyld.com>\n"
        "  http://www.scyld.com/network/drivers.html\n";
@@ -375,8 +377,8 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
        irq = pdev->irq;
        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
-                pr_warning("Winbond-840: Device %s disabled due to DMA limitations\n",
+                pr_warn("Device %s disabled due to DMA limitations\n",
-                           pci_name(pdev));
+                        pci_name(pdev));
                return -EIO;
        }
        dev = alloc_etherdev(sizeof(*np));
@@ -643,8 +645,7 @@ static int netdev_open(struct net_device *dev)
                goto out_err;
        if (debug > 1)
-                printk(KERN_DEBUG "%s: w89c840_open() irq %d\n",
+                netdev_dbg(dev, "w89c840_open() irq %d\n", dev->irq);
-                       dev->name, dev->irq);
        if((i=alloc_ringdesc(dev)))
                goto out_err;
@@ -656,13 +657,13 @@ static int netdev_open(struct net_device *dev)
        netif_start_queue(dev);
        if (debug > 2)
-                printk(KERN_DEBUG "%s: Done netdev_open()\n", dev->name);
+                netdev_dbg(dev, "Done netdev_open()\n");
        /* Set the timer to check for link beat. */
        init_timer(&np->timer);
        np->timer.expires = jiffies + 1*HZ;
        np->timer.data = (unsigned long)dev;
-        np->timer.function = &netdev_timer;                             /* timer handler */
+        np->timer.function = netdev_timer;                              /* timer handler */
        add_timer(&np->timer);
        return 0;
 out_err:
@@ -785,9 +786,9 @@ static void netdev_timer(unsigned long data)
        void __iomem *ioaddr = np->base_addr;
        if (debug > 2)
-                printk(KERN_DEBUG "%s: Media selection timer tick, status %08x config %08x\n",
+                netdev_dbg(dev, "Media selection timer tick, status %08x config %08x\n",
-                       dev->name, ioread32(ioaddr + IntrStatus),
+                           ioread32(ioaddr + IntrStatus),
-                       ioread32(ioaddr + NetworkConfig));
+                           ioread32(ioaddr + NetworkConfig));
        spin_lock_irq(&np->lock);
        update_csr6(dev, update_link(dev));
        spin_unlock_irq(&np->lock);
@@ -1054,8 +1055,8 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)
        spin_unlock_irq(&np->lock);
        if (debug > 4) {
-                printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d\n",
+                netdev_dbg(dev, "Transmit frame #%d queued in slot %d\n",
-                       dev->name, np->cur_tx, entry);
+                           np->cur_tx, entry);
        }
        return NETDEV_TX_OK;
 }
@@ -1072,8 +1073,8 @@ static void netdev_tx_done(struct net_device *dev)
                if (tx_status & 0x8000) {       /* There was an error, log it. */
 #ifndef final_version
                        if (debug > 1)
-                                printk(KERN_DEBUG "%s: Transmit error, Tx status %08x\n",
+                                netdev_dbg(dev, "Transmit error, Tx status %08x\n",
-                                       dev->name, tx_status);
+                                           tx_status);
 #endif
                        np->stats.tx_errors++;
                        if (tx_status & 0x0104) np->stats.tx_aborted_errors++;
@@ -1085,8 +1086,8 @@ static void netdev_tx_done(struct net_device *dev)
                } else {
 #ifndef final_version
                        if (debug > 3)
-                                printk(KERN_DEBUG "%s: Transmit slot %d ok, Tx status %08x\n",
+                                netdev_dbg(dev, "Transmit slot %d ok, Tx status %08x\n",
-                                       dev->name, entry, tx_status);
+                                           entry, tx_status);
 #endif
                        np->stats.tx_bytes += np->tx_skbuff[entry]->len;
                        np->stats.collisions += (tx_status >> 3) & 15;
@@ -1129,8 +1130,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
                iowrite32(intr_status & 0x001ffff, ioaddr + IntrStatus);
                if (debug > 4)
-                        printk(KERN_DEBUG "%s: Interrupt, status %04x\n",
+                        netdev_dbg(dev, "Interrupt, status %04x\n", intr_status);
-                               dev->name, intr_status);
                if ((intr_status & (NormalIntr|AbnormalIntr)) == 0)
                        break;
@@ -1171,8 +1171,8 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
        } while (1);
        if (debug > 3)
-                printk(KERN_DEBUG "%s: exiting interrupt, status=%#4.4x\n",
+                netdev_dbg(dev, "exiting interrupt, status=%#4.4x\n",
-                       dev->name, ioread32(ioaddr + IntrStatus));
+                           ioread32(ioaddr + IntrStatus));
        return IRQ_RETVAL(handled);
 }
@@ -1185,8 +1185,8 @@ static int netdev_rx(struct net_device *dev)
        int work_limit = np->dirty_rx + RX_RING_SIZE - np->cur_rx;
        if (debug > 4) {
-                printk(KERN_DEBUG " In netdev_rx(), entry %d status %04x\n",
+                netdev_dbg(dev, " In netdev_rx(), entry %d status %04x\n",
-                       entry, np->rx_ring[entry].status);
+                           entry, np->rx_ring[entry].status);
        }
        /* If EOP is set on the next entry, it's a new packet. Send it up. */
@@ -1195,8 +1195,8 @@ static int netdev_rx(struct net_device *dev)
                s32 status = desc->status;
                if (debug > 4)
-                        printk(KERN_DEBUG "  netdev_rx() status was %08x\n",
+                        netdev_dbg(dev, "  netdev_rx() status was %08x\n",
-                               status);
+                                   status);
                if (status < 0)
                        break;
                if ((status & 0x38008300) != 0x0300) {
@@ -1211,8 +1211,8 @@ static int netdev_rx(struct net_device *dev)
                        } else if (status & 0x8000) {
                                /* There was a fatal error. */
                                if (debug > 2)
-                                        printk(KERN_DEBUG "%s: Receive error, Rx status %08x\n",
+                                        netdev_dbg(dev, "Receive error, Rx status %08x\n",
-                                               dev->name, status);
+                                                   status);
                                np->stats.rx_errors++; /* end of a packet.*/
                                if (status & 0x0890) np->stats.rx_length_errors++;
                                if (status & 0x004C) np->stats.rx_frame_errors++;
@@ -1225,8 +1225,8 @@ static int netdev_rx(struct net_device *dev)
 #ifndef final_version
                        if (debug > 4)
-                                printk(KERN_DEBUG "  netdev_rx() normal Rx pkt length %d status %x\n",
+                                netdev_dbg(dev, "  netdev_rx() normal Rx pkt length %d status %x\n",
-                                       pkt_len, status);
+                                           pkt_len, status);
 #endif
                        /* Check if the packet is long enough to accept without copying
                           to a minimally-sized skbuff. */
@@ -1251,10 +1251,10 @@ static int netdev_rx(struct net_device *dev)
 #ifndef final_version                           /* Remove after testing. */
                        /* You will want this info for the initial debug. */
                        if (debug > 5)
-                                printk(KERN_DEBUG "  Rx data %pM %pM %02x%02x %pI4\n",
+                                netdev_dbg(dev, "  Rx data %pM %pM %02x%02x %pI4\n",
-                                       &skb->data[0], &skb->data[6],
+                                           &skb->data[0], &skb->data[6],
-                                       skb->data[12], skb->data[13],
+                                           skb->data[12], skb->data[13],
-                                       &skb->data[14]);
+                                           &skb->data[14]);
 #endif
                        skb->protocol = eth_type_trans(skb, dev);
                        netif_rx(skb);
@@ -1292,8 +1292,7 @@ static void netdev_error(struct net_device *dev, int intr_status)
        void __iomem *ioaddr = np->base_addr;
        if (debug > 2)
-                printk(KERN_DEBUG "%s: Abnormal event, %08x\n",
+                netdev_dbg(dev, "Abnormal event, %08x\n", intr_status);
-                       dev->name, intr_status);
        if (intr_status == 0xffffffff)
                return;
        spin_lock(&np->lock);
@@ -1313,8 +1312,7 @@ static void netdev_error(struct net_device *dev, int intr_status)
                        new = 127; /* load full packet before starting */
                new = (np->csr6 & ~(0x7F << 14)) | (new<<14);
 #endif
-                printk(KERN_DEBUG "%s: Tx underflow, new csr6 %08x\n",
+                netdev_dbg(dev, "Tx underflow, new csr6 %08x\n", new);
-                       dev->name, new);
                update_csr6(dev, new);
        }
        if (intr_status & RxDied) {             /* Missed a Rx frame. */
@@ -1487,13 +1485,12 @@ static int netdev_close(struct net_device *dev)
        netif_stop_queue(dev);
        if (debug > 1) {
-                printk(KERN_DEBUG "%s: Shutting down ethercard, status was %08x Config %08x\n",
+                netdev_dbg(dev, "Shutting down ethercard, status was %08x Config %08x\n",
-                       dev->name, ioread32(ioaddr + IntrStatus),
+                           ioread32(ioaddr + IntrStatus),
-                       ioread32(ioaddr + NetworkConfig));
+                           ioread32(ioaddr + NetworkConfig));
-                printk(KERN_DEBUG "%s: Queue pointers were Tx %d / %d,  Rx %d / %d\n",
+                netdev_dbg(dev, "Queue pointers were Tx %d / %d,  Rx %d / %d\n",
-                       dev->name,
+                           np->cur_tx, np->dirty_tx,
-                       np->cur_tx, np->dirty_tx,
+                           np->cur_rx, np->dirty_rx);
-                       np->cur_rx, np->dirty_rx);
        }
        /* Stop the chip's Tx and Rx processes. */
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index a439e93be22d..988b8eb24d37 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -29,7 +29,6 @@
 #include <linux/skbuff.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/ethtool.h>
 #include <linux/bitops.h>
 #include <asm/uaccess.h>
@@ -38,15 +37,6 @@
 #include <asm/irq.h>
 #endif
-#ifdef DEBUG
-#define enter(x)   printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__)
-#define leave(x)   printk("Leave: %s, %s line %i\n",x,__FILE__,__LINE__)
-#else
-#define enter(x)   do {} while (0)
-#define leave(x)   do {} while (0)
-#endif
 MODULE_DESCRIPTION("Xircom Cardbus ethernet driver");
 MODULE_AUTHOR("Arjan van de Ven <arjanv@redhat.com>");
 MODULE_LICENSE("GPL");
@@ -162,7 +152,7 @@ static struct pci_driver xircom_ops = {
 };
-#ifdef DEBUG
+#if defined DEBUG && DEBUG > 1
 static void print_binary(unsigned int number)
 {
        int i,i2;
@@ -177,23 +167,10 @@ static void print_binary(unsigned int number)
                if ((i&3)==0)
                        buffer[i2++]=' ';
        }
-        printk("%s\n",buffer);
+        pr_debug("%s\n",buffer);
 }
 #endif
-static void netdev_get_drvinfo(struct net_device *dev,
-                               struct ethtool_drvinfo *info)
-{
-        struct xircom_private *private = netdev_priv(dev);
-        strcpy(info->driver, "xircom_cb");
-        strcpy(info->bus_info, pci_name(private->pdev));
-}
-static const struct ethtool_ops netdev_ethtool_ops = {
-        .get_drvinfo            = netdev_get_drvinfo,
-};
 static const struct net_device_ops netdev_ops = {
        .ndo_open               = xircom_open,
        .ndo_stop               = xircom_close,
@@ -219,7 +196,6 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
        struct xircom_private *private;
        unsigned long flags;
        unsigned short tmp16;
-        enter("xircom_probe");
        /* First do the PCI initialisation */
@@ -279,7 +255,6 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
        setup_descriptors(private);
        dev->netdev_ops = &netdev_ops;
-        SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
        pci_set_drvdata(pdev, dev);
        if (register_netdev(dev)) {
@@ -287,8 +262,8 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
                goto reg_fail;
        }
-        dev_info(&dev->dev, "Xircom cardbus revision %i at irq %i\n",
+        netdev_info(dev, "Xircom cardbus revision %i at irq %i\n",
-                 pdev->revision, pdev->irq);
+                    pdev->revision, pdev->irq);
        /* start the transmitter to get a heartbeat */
        /* TODO: send 2 dummy packets here */
        transceiver_voodoo(private);
@@ -300,7 +275,6 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
        trigger_receive(private);
-        leave("xircom_probe");
        return 0;
 reg_fail:
@@ -325,7 +299,6 @@ static void __devexit xircom_remove(struct pci_dev *pdev)
        struct net_device *dev = pci_get_drvdata(pdev);
        struct xircom_private *card = netdev_priv(dev);
-        enter("xircom_remove");
        pci_free_consistent(pdev,8192,card->rx_buffer,card->rx_dma_handle);
        pci_free_consistent(pdev,8192,card->tx_buffer,card->tx_dma_handle);
@@ -333,7 +306,6 @@ static void __devexit xircom_remove(struct pci_dev *pdev)
        unregister_netdev(dev);
        free_netdev(dev);
        pci_set_drvdata(pdev, NULL);
-        leave("xircom_remove");
 }
 static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
@@ -343,17 +315,15 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
        unsigned int status;
        int i;
-        enter("xircom_interrupt\n");
        spin_lock(&card->lock);
        status = inl(card->io_port+CSR5);
-#ifdef DEBUG
+#if defined DEBUG && DEBUG > 1
        print_binary(status);
-        printk("tx status 0x%08x 0x%08x\n",
+        pr_debug("tx status 0x%08x 0x%08x\n",
-               card->tx_buffer[0], card->tx_buffer[4]);
+                 card->tx_buffer[0], card->tx_buffer[4]);
-        printk("rx status 0x%08x 0x%08x\n",
+        pr_debug("rx status 0x%08x 0x%08x\n",
-               card->rx_buffer[0], card->rx_buffer[4]);
+                 card->rx_buffer[0], card->rx_buffer[4]);
 #endif
        /* Handle shared irq and hotplug */
        if (status == 0 || status == 0xffffffff) {
@@ -363,9 +333,9 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
        if (link_status_changed(card)) {
                int newlink;
-                printk(KERN_DEBUG "xircom_cb: Link status has changed\n");
+                netdev_dbg(dev, "Link status has changed\n");
                newlink = link_status(card);
-                dev_info(&dev->dev, "Link is %i mbit\n", newlink);
+                netdev_info(dev, "Link is %d mbit\n", newlink);
                if (newlink)
                        netif_carrier_on(dev);
                else
@@ -384,9 +354,7 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
        for (i=0;i<NUMDESCRIPTORS;i++)
                investigate_read_descriptor(dev,card,i,bufferoffsets[i]);
        spin_unlock(&card->lock);
-        leave("xircom_interrupt");
        return IRQ_HANDLED;
 }
@@ -397,7 +365,6 @@ static netdev_tx_t xircom_start_xmit(struct sk_buff *skb,
        unsigned long flags;
        int nextdescriptor;
        int desc;
-        enter("xircom_start_xmit");
        card = netdev_priv(dev);
        spin_lock_irqsave(&card->lock,flags);
@@ -439,13 +406,10 @@ static netdev_tx_t xircom_start_xmit(struct sk_buff *skb,
                                netif_stop_queue(dev);
                        }
                        card->transmit_used = nextdescriptor;
-                        leave("xircom-start_xmit - sent");
                        spin_unlock_irqrestore(&card->lock,flags);
                        return NETDEV_TX_OK;
        }
        /* Uh oh... no free descriptor... drop the packet */
        netif_stop_queue(dev);
        spin_unlock_irqrestore(&card->lock,flags);
@@ -461,18 +425,16 @@ static int xircom_open(struct net_device *dev)
 {
        struct xircom_private *xp = netdev_priv(dev);
        int retval;
-        enter("xircom_open");
-        pr_info("xircom cardbus adaptor found, registering as %s, using irq %i\n",
+        netdev_info(dev, "xircom cardbus adaptor found, using irq %i\n",
-                dev->name, dev->irq);
+                    dev->irq);
        retval = request_irq(dev->irq, xircom_interrupt, IRQF_SHARED, dev->name, dev);
-        if (retval) {
+        if (retval)
-                leave("xircom_open - No IRQ");
                return retval;
-        }
        xircom_up(xp);
        xp->open = 1;
-        leave("xircom_open");
        return 0;
 }
@@ -481,7 +443,6 @@ static int xircom_close(struct net_device *dev)
        struct xircom_private *card;
        unsigned long flags;
-        enter("xircom_close");
        card = netdev_priv(dev);
        netif_stop_queue(dev); /* we don't want new packets */
@@ -501,8 +462,6 @@ static int xircom_close(struct net_device *dev)
        card->open = 0;
        free_irq(dev->irq,dev);
-        leave("xircom_close");
        return 0;
 }
@@ -522,8 +481,6 @@ static void initialize_card(struct xircom_private *card)
 {
        unsigned int val;
        unsigned long flags;
-        enter("initialize_card");
        spin_lock_irqsave(&card->lock, flags);
@@ -549,8 +506,6 @@ static void initialize_card(struct xircom_private *card)
        deactivate_transmitter(card);
        spin_unlock_irqrestore(&card->lock, flags);
-        leave("initialize_card");
 }
 /*
@@ -562,12 +517,9 @@ ignored; I chose zero.
 static void trigger_transmit(struct xircom_private *card)
 {
        unsigned int val;
-        enter("trigger_transmit");
        val = 0;
        outl(val, card->io_port + CSR1);
-        leave("trigger_transmit");
 }
 /*
@@ -580,12 +532,9 @@ ignored; I chose zero.
 static void trigger_receive(struct xircom_private *card)
 {
        unsigned int val;
-        enter("trigger_receive");
        val = 0;
        outl(val, card->io_port + CSR2);
-        leave("trigger_receive");
 }
 /*
@@ -596,8 +545,6 @@ static void setup_descriptors(struct xircom_private *card)
 {
        u32 address;
        int i;
-        enter("setup_descriptors");
        BUG_ON(card->rx_buffer == NULL);
        BUG_ON(card->tx_buffer == NULL);
@@ -651,8 +598,6 @@ static void setup_descriptors(struct xircom_private *card)
        /* wite the transmit descriptor ring to the card */
        address = card->tx_dma_handle;
        outl(address, card->io_port + CSR4);    /* xmit descr list address */
-        leave("setup_descriptors");
 }
 /*
@@ -662,13 +607,10 @@ valid by setting the address in the card to 0x00.
 static void remove_descriptors(struct xircom_private *card)
 {
        unsigned int val;
-        enter("remove_descriptors");
        val = 0;
        outl(val, card->io_port + CSR3);        /* Receive descriptor address */
        outl(val, card->io_port + CSR4);        /* Send descriptor address */
-        leave("remove_descriptors");
 }
 /*
@@ -680,21 +622,17 @@ This function also clears the status-bit.
 static int link_status_changed(struct xircom_private *card)
 {
        unsigned int val;
-        enter("link_status_changed");
        val = inl(card->io_port + CSR5);        /* Status register */
-        if ((val & (1 << 27)) == 0) {   /* no change */
+        if ((val & (1 << 27)) == 0)             /* no change */
-                leave("link_status_changed - nochange");
                return 0;
-        }
        /* clear the event by writing a 1 to the bit in the
           status register. */
        val = (1 << 27);
        outl(val, card->io_port + CSR5);
-        leave("link_status_changed - changed");
        return 1;
 }
@@ -706,16 +644,12 @@ in a non-stopped state.
 static int transmit_active(struct xircom_private *card)
 {
        unsigned int val;
-        enter("transmit_active");
        val = inl(card->io_port + CSR5);        /* Status register */
-        if ((val & (7 << 20)) == 0) {   /* transmitter disabled */
+        if ((val & (7 << 20)) == 0)             /* transmitter disabled */
-                leave("transmit_active - inactive");
                return 0;
-        }
-        leave("transmit_active - active");
        return 1;
 }
@@ -726,17 +660,12 @@ in a non-stopped state.
 static int receive_active(struct xircom_private *card)
 {
        unsigned int val;
-        enter("receive_active");
        val = inl(card->io_port + CSR5);        /* Status register */
-        if ((val & (7 << 17)) == 0) {   /* receiver disabled */
+        if ((val & (7 << 17)) == 0)             /* receiver disabled */
-                leave("receive_active - inactive");
                return 0;
-        }
-        leave("receive_active - active");
        return 1;
 }
@@ -754,8 +683,6 @@ static void activate_receiver(struct xircom_private *card)
 {
        unsigned int val;
        int counter;
-        enter("activate_receiver");
        val = inl(card->io_port + CSR6);        /* Operation mode */
@@ -776,7 +703,7 @@ static void activate_receiver(struct xircom_private *card)
                udelay(50);
                counter--;
                if (counter <= 0)
-                        pr_err("Receiver failed to deactivate\n");
+                        netdev_err(card->dev, "Receiver failed to deactivate\n");
        }
        /* enable the receiver */
@@ -793,10 +720,9 @@ static void activate_receiver(struct xircom_private *card)
                udelay(50);
                counter--;
                if (counter <= 0)
-                        pr_err("Receiver failed to re-activate\n");
+                        netdev_err(card->dev,
+                                   "Receiver failed to re-activate\n");
        }
-        leave("activate_receiver");
 }
 /*
@@ -810,7 +736,6 @@ static void deactivate_receiver(struct xircom_private *card)
 {
        unsigned int val;
        int counter;
-        enter("deactivate_receiver");
        val = inl(card->io_port + CSR6);        /* Operation mode */
        val = val & ~2;                         /* disable the receiver */
@@ -824,11 +749,8 @@ static void deactivate_receiver(struct xircom_private *card)
                udelay(50);
                counter--;
                if (counter <= 0)
-                        pr_err("Receiver failed to deactivate\n");
+                        netdev_err(card->dev, "Receiver failed to deactivate\n");
        }
-        leave("deactivate_receiver");
 }
@@ -846,8 +768,6 @@ static void activate_transmitter(struct xircom_private *card)
 {
        unsigned int val;
        int counter;
-        enter("activate_transmitter");
        val = inl(card->io_port + CSR6);        /* Operation mode */
@@ -867,7 +787,8 @@ static void activate_transmitter(struct xircom_private *card)
                udelay(50);
                counter--;
                if (counter <= 0)
-                        pr_err("Transmitter failed to deactivate\n");
+                        netdev_err(card->dev,
+                                   "Transmitter failed to deactivate\n");
        }
        /* enable the transmitter */
@@ -884,10 +805,9 @@ static void activate_transmitter(struct xircom_private *card)
                udelay(50);
                counter--;
                if (counter <= 0)
-                        pr_err("Transmitter failed to re-activate\n");
+                        netdev_err(card->dev,
+                                   "Transmitter failed to re-activate\n");
        }
-        leave("activate_transmitter");
 }
 /*
@@ -901,7 +821,6 @@ static void deactivate_transmitter(struct xircom_private *card)
 {
        unsigned int val;
        int counter;
-        enter("deactivate_transmitter");
        val = inl(card->io_port + CSR6);        /* Operation mode */
        val = val & ~2;         /* disable the transmitter */
@@ -915,11 +834,9 @@ static void deactivate_transmitter(struct xircom_private *card)
                udelay(50);
                counter--;
                if (counter <= 0)
-                        pr_err("Transmitter failed to deactivate\n");
+                        netdev_err(card->dev,
+                                   "Transmitter failed to deactivate\n");
        }
-        leave("deactivate_transmitter");
 }
@@ -931,13 +848,10 @@ must be called with the lock held and interrupts disabled.
 static void enable_transmit_interrupt(struct xircom_private *card)
 {
        unsigned int val;
-        enter("enable_transmit_interrupt");
        val = inl(card->io_port + CSR7);        /* Interrupt enable register */
        val |= 1;                               /* enable the transmit interrupt */
        outl(val, card->io_port + CSR7);
-        leave("enable_transmit_interrupt");
 }
@@ -949,13 +863,10 @@ must be called with the lock held and interrupts disabled.
 static void enable_receive_interrupt(struct xircom_private *card)
 {
        unsigned int val;
-        enter("enable_receive_interrupt");
        val = inl(card->io_port + CSR7);        /* Interrupt enable register */
        val = val | (1 << 6);                   /* enable the receive interrupt */
        outl(val, card->io_port + CSR7);
-        leave("enable_receive_interrupt");
 }
 /*
@@ -966,13 +877,10 @@ must be called with the lock held and interrupts disabled.
 static void enable_link_interrupt(struct xircom_private *card)
 {
        unsigned int val;
-        enter("enable_link_interrupt");
        val = inl(card->io_port + CSR7);        /* Interrupt enable register */
        val = val | (1 << 27);                  /* enable the link status chage interrupt */
        outl(val, card->io_port + CSR7);
-        leave("enable_link_interrupt");
 }
@@ -985,12 +893,9 @@ must be called with the lock held and interrupts disabled.
 static void disable_all_interrupts(struct xircom_private *card)
 {
        unsigned int val;
-        enter("enable_all_interrupts");
        val = 0;                                /* disable all interrupts */
        outl(val, card->io_port + CSR7);
-        leave("disable_all_interrupts");
 }
 /*
@@ -1001,7 +906,6 @@ must be called with the lock held and interrupts disabled.
 static void enable_common_interrupts(struct xircom_private *card)
 {
        unsigned int val;
-        enter("enable_link_interrupt");
        val = inl(card->io_port + CSR7);        /* Interrupt enable register */
        val |= (1<<16); /* Normal Interrupt Summary */
@@ -1013,8 +917,6 @@ static void enable_common_interrupts(struct xircom_private *card)
        val |= (1<<2);  /* Transmit Buffer Unavailable */
        val |= (1<<1);  /* Transmit Process Stopped */
        outl(val, card->io_port + CSR7);
-        leave("enable_link_interrupt");
 }
 /*
@@ -1025,13 +927,11 @@ must be called with the lock held and interrupts disabled.
 static int enable_promisc(struct xircom_private *card)
 {
        unsigned int val;
-        enter("enable_promisc");
        val = inl(card->io_port + CSR6);
        val = val | (1 << 6);
        outl(val, card->io_port + CSR6);
-        leave("enable_promisc");
        return 1;
 }
@@ -1046,7 +946,6 @@ Must be called in locked state with interrupts disabled
 static int link_status(struct xircom_private *card)
 {
        unsigned int val;
-        enter("link_status");
        val = inb(card->io_port + CSR12);
@@ -1057,7 +956,6 @@ static int link_status(struct xircom_private *card)
        /* If we get here -> no link at all */
-        leave("link_status");
        return 0;
 }
@@ -1076,8 +974,6 @@ static void read_mac_address(struct xircom_private *card)
        unsigned long flags;
        int i;
-        enter("read_mac_address");
        spin_lock_irqsave(&card->lock, flags);
        outl(1 << 12, card->io_port + CSR9);    /* enable boot rom access */
@@ -1105,7 +1001,6 @@ static void read_mac_address(struct xircom_private *card)
        }
        spin_unlock_irqrestore(&card->lock, flags);
        pr_debug(" %pM\n", card->dev->dev_addr);
-        leave("read_mac_address");
 }
@@ -1118,8 +1013,6 @@ static void transceiver_voodoo(struct xircom_private *card)
 {
        unsigned long flags;
-        enter("transceiver_voodoo");
        /* disable all powermanagement */
        pci_write_config_dword(card->pdev, PCI_POWERMGMT, 0x0000);
@@ -1137,7 +1030,6 @@ static void transceiver_voodoo(struct xircom_private *card)
        spin_unlock_irqrestore(&card->lock, flags);
        netif_start_queue(card->dev);
-        leave("transceiver_voodoo");
 }
@@ -1146,8 +1038,6 @@ static void xircom_up(struct xircom_private *card)
        unsigned long flags;
        int i;
-        enter("xircom_up");
        /* disable all powermanagement */
        pci_write_config_dword(card->pdev, PCI_POWERMGMT, 0x0000);
@@ -1171,87 +1061,84 @@ static void xircom_up(struct xircom_private *card)
        trigger_receive(card);
        trigger_transmit(card);
        netif_start_queue(card->dev);
-        leave("xircom_up");
 }
 /* Bufferoffset is in BYTES */
-static void investigate_read_descriptor(struct net_device *dev,struct xircom_private *card, int descnr, unsigned int bufferoffset)
+static void
+investigate_read_descriptor(struct net_device *dev, struct xircom_private *card,
+                            int descnr, unsigned int bufferoffset)
 {
-                int status;
+        int status;
-                enter("investigate_read_descriptor");
+        status = le32_to_cpu(card->rx_buffer[4*descnr]);
-                status = le32_to_cpu(card->rx_buffer[4*descnr]);
-                if ((status > 0)) {     /* packet received */
+        if (status > 0) {               /* packet received */
-                        /* TODO: discard error packets */
+                /* TODO: discard error packets */
-                        short pkt_len = ((status >> 16) & 0x7ff) - 4;   /* minus 4, we don't want the CRC */
+                short pkt_len = ((status >> 16) & 0x7ff) - 4;
-                        struct sk_buff *skb;
+                                        /* minus 4, we don't want the CRC */
+                struct sk_buff *skb;
-                        if (pkt_len > 1518) {
+                if (pkt_len > 1518) {
-                                pr_err("Packet length %i is bogus\n", pkt_len);
+                        netdev_err(dev, "Packet length %i is bogus\n", pkt_len);
-                                pkt_len = 1518;
+                        pkt_len = 1518;
-                        }
-                        skb = dev_alloc_skb(pkt_len + 2);
-                        if (skb == NULL) {
-                                dev->stats.rx_dropped++;
-                                goto out;
-                        }
-                        skb_reserve(skb, 2);
-                        skb_copy_to_linear_data(skb, (unsigned char*)&card->rx_buffer[bufferoffset / 4], pkt_len);
-                        skb_put(skb, pkt_len);
-                        skb->protocol = eth_type_trans(skb, dev);
-                        netif_rx(skb);
-                        dev->stats.rx_packets++;
-                        dev->stats.rx_bytes += pkt_len;
-                      out:
-                        /* give the buffer back to the card */
-                        card->rx_buffer[4*descnr] =  cpu_to_le32(0x80000000);
-                        trigger_receive(card);
                }
-                leave("investigate_read_descriptor");
+                skb = dev_alloc_skb(pkt_len + 2);
+                if (skb == NULL) {
+                        dev->stats.rx_dropped++;
+                        goto out;
+                }
+                skb_reserve(skb, 2);
+                skb_copy_to_linear_data(skb,
+                                        &card->rx_buffer[bufferoffset / 4],
+                                        pkt_len);
+                skb_put(skb, pkt_len);
+                skb->protocol = eth_type_trans(skb, dev);
+                netif_rx(skb);
+                dev->stats.rx_packets++;
+                dev->stats.rx_bytes += pkt_len;
+out:
+                /* give the buffer back to the card */
+                card->rx_buffer[4*descnr] = cpu_to_le32(0x80000000);
+                trigger_receive(card);
+        }
 }
 /* Bufferoffset is in BYTES */
-static void investigate_write_descriptor(struct net_device *dev, struct xircom_private *card, int descnr, unsigned int bufferoffset)
+static void
+investigate_write_descriptor(struct net_device *dev,
+                             struct xircom_private *card,
+                             int descnr, unsigned int bufferoffset)
 {
-                int status;
+        int status;
-                enter("investigate_write_descriptor");
-                status = le32_to_cpu(card->tx_buffer[4*descnr]);
+        status = le32_to_cpu(card->tx_buffer[4*descnr]);
 #if 0
-                if (status & 0x8000) {  /* Major error */
+        if (status & 0x8000) {  /* Major error */
-                        pr_err("Major transmit error status %x\n", status);
+                pr_err("Major transmit error status %x\n", status);
-                        card->tx_buffer[4*descnr] = 0;
+                card->tx_buffer[4*descnr] = 0;
-                        netif_wake_queue (dev);
+                netif_wake_queue (dev);
-                }
+        }
 #endif
-                if (status > 0) {       /* bit 31 is 0 when done */
+        if (status > 0) {       /* bit 31 is 0 when done */
-                        if (card->tx_skb[descnr]!=NULL) {
+                if (card->tx_skb[descnr]!=NULL) {
-                                dev->stats.tx_bytes += card->tx_skb[descnr]->len;
+                        dev->stats.tx_bytes += card->tx_skb[descnr]->len;
-                                dev_kfree_skb_irq(card->tx_skb[descnr]);
+                        dev_kfree_skb_irq(card->tx_skb[descnr]);
-                        }
-                        card->tx_skb[descnr] = NULL;
-                        /* Bit 8 in the status field is 1 if there was a collision */
-                        if (status&(1<<8))
-                                dev->stats.collisions++;
-                        card->tx_buffer[4*descnr] = 0; /* descriptor is free again */
-                        netif_wake_queue (dev);
-                        dev->stats.tx_packets++;
                }
+                card->tx_skb[descnr] = NULL;
-                leave("investigate_write_descriptor");
+                /* Bit 8 in the status field is 1 if there was a collision */
+                if (status & (1 << 8))
+                        dev->stats.collisions++;
+                card->tx_buffer[4*descnr] = 0; /* descriptor is free again */
+                netif_wake_queue (dev);
+                dev->stats.tx_packets++;
+        }
 }
 static int __init xircom_init(void)
 {
        return pci_register_driver(&xircom_ops);