1 files changed, 83 insertions, 87 deletions

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 74e5ba42d38d..19cafc2b418d 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -42,6 +42,7 @@
 #include <linux/compiler.h>
 #include <linux/rtnetlink.h>
 #include <linux/crc32.h>
+#include <linux/slab.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -62,9 +63,9 @@ module_param (debug, int, 0);
 MODULE_PARM_DESC (debug, "de2104x bitmapped message enable number");
 
 /* Set the copy breakpoint for the copy-only-tiny-buffer Rx structure. */
-#if defined(__alpha__) || defined(__arm__) || defined(__hppa__) \
-        || defined(CONFIG_SPARC) || defined(__ia64__) \
-        || defined(__sh__) || defined(__mips__)
+#if defined(__alpha__) || defined(__arm__) || defined(__hppa__) || \
+        defined(CONFIG_SPARC) || defined(__ia64__) ||              \
+        defined(__sh__) || defined(__mips__)
 static int rx_copybreak = 1518;
 #else
 static int rx_copybreak = 100;
@@ -337,7 +338,7 @@ static void de21041_media_timer (unsigned long data);
 static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media);
 
 
-static struct pci_device_id de_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(de_pci_tbl) = {
         { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
         { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_PLUS,
@@ -382,9 +383,9 @@ static void de_rx_err_acct (struct de_private *de, unsigned rx_tail,
                 /* Ingore earlier buffers. */
                 if ((status & 0xffff) != 0x7fff) {
                         if (netif_msg_rx_err(de))
-                                printk(KERN_WARNING "%s: Oversized Ethernet frame "
-                                           "spanned multiple buffers, status %8.8x!\n",
-                                           de->dev->name, status);
+                                dev_warn(&de->dev->dev,
+                                         "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
+                                         status);
                         de->net_stats.rx_length_errors++;
                 }
         } else if (status & RxError) {
@@ -487,7 +488,7 @@ rx_next:
         }
 
         if (!rx_work)
-                printk(KERN_WARNING "%s: rx work limit reached\n", de->dev->name);
+                dev_warn(&de->dev->dev, "rx work limit reached\n");
 
         de->rx_tail = rx_tail;
 }
@@ -504,7 +505,8 @@ static irqreturn_t de_interrupt (int irq, void *dev_instance)
 
         if (netif_msg_intr(de))
                 printk(KERN_DEBUG "%s: intr, status %08x mode %08x desc %u/%u/%u\n",
-                        dev->name, status, dr32(MacMode), de->rx_tail, de->tx_head, de->tx_tail);
+                       dev->name, status, dr32(MacMode),
+                       de->rx_tail, de->tx_head, de->tx_tail);
 
         dw32(MacStatus, status);
 
@@ -529,8 +531,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);
-                printk(KERN_ERR "%s: PCI bus error, status=%08x, PCI status=%04x\n",
-                       dev->name, status, pci_status);
+                dev_err(&de->dev->dev,
+                        "PCI bus error, status=%08x, PCI status=%04x\n",
+                        status, pci_status);
         }
 
         return IRQ_HANDLED;
@@ -582,7 +585,8 @@ static void de_tx (struct de_private *de)
                                 de->net_stats.tx_packets++;
                                 de->net_stats.tx_bytes += skb->len;
                                 if (netif_msg_tx_done(de))
-                                        printk(KERN_DEBUG "%s: tx done, slot %d\n", de->dev->name, tx_tail);
+                                        printk(KERN_DEBUG "%s: tx done, slot %d\n",
+                                               de->dev->name, tx_tail);
                         }
                         dev_kfree_skb_irq(skb);
                 }
@@ -674,18 +678,17 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
         memset(hash_table, 0, sizeof(hash_table));
         set_bit_le(255, hash_table);                    /* Broadcast entry */
         /* This should work on big-endian machines as well. */
-        for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
-             i++, mclist = mclist->next) {
+        netdev_for_each_mc_addr(mclist, dev) {
                 int index = ether_crc_le(ETH_ALEN, mclist->dmi_addr) & 0x1ff;
 
                 set_bit_le(index, hash_table);
+        }
 
-                for (i = 0; i < 32; i++) {
-                        *setup_frm++ = hash_table[i];
-                        *setup_frm++ = hash_table[i];
-                }
-                setup_frm = &de->setup_frame[13*6];
+        for (i = 0; i < 32; i++) {
+                *setup_frm++ = hash_table[i];
+                *setup_frm++ = hash_table[i];
         }
+        setup_frm = &de->setup_frame[13*6];
 
         /* Fill the final entry with our physical address. */
         eaddrs = (u16 *)dev->dev_addr;
@@ -698,20 +701,18 @@ static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev)
 {
         struct de_private *de = netdev_priv(dev);
         struct dev_mc_list *mclist;
-        int i;
         u16 *eaddrs;
 
         /* We have <= 14 addresses so we can use the wonderful
            16 address perfect filtering of the Tulip. */
-        for (i = 0, mclist = dev->mc_list; i < dev->mc_count;
-             i++, mclist = mclist->next) {
+        netdev_for_each_mc_addr(mclist, dev) {
                 eaddrs = (u16 *)mclist->dmi_addr;
                 *setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
                 *setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
                 *setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
         }
         /* Fill the unused entries with the broadcast address. */
-        memset(setup_frm, 0xff, (15-i)*12);
+        memset(setup_frm, 0xff, (15 - netdev_mc_count(dev)) * 12);
         setup_frm = &de->setup_frame[15*6];
 
         /* Fill the final entry with our physical address. */
@@ -738,7 +739,7 @@ static void __de_set_rx_mode (struct net_device *dev)
                 goto out;
         }
 
-        if ((dev->mc_count > 1000) || (dev->flags & IFF_ALLMULTI)) {
+        if ((netdev_mc_count(dev) > 1000) || (dev->flags & IFF_ALLMULTI)) {
                 /* Too many to filter well -- accept all multicasts. */
                 macmode |= AcceptAllMulticast;
                 goto out;
@@ -746,7 +747,7 @@ static void __de_set_rx_mode (struct net_device *dev)
 
         /* Note that only the low-address shortword of setup_frame is valid!
            The values are doubled for big-endian architectures. */
-        if (dev->mc_count > 14) /* Must use a multicast hash table. */
+        if (netdev_mc_count(dev) > 14)  /* Must use a multicast hash table. */
                 build_setup_frame_hash (de->setup_frame, dev);
         else
                 build_setup_frame_perfect (de->setup_frame, dev);
@@ -870,7 +871,7 @@ static void de_stop_rxtx (struct de_private *de)
                 udelay(100);
         }
 
-        printk(KERN_WARNING "%s: timeout expired stopping DMA\n", de->dev->name);
+        dev_warn(&de->dev->dev, "timeout expired stopping DMA\n");
 }
 
 static inline void de_start_rxtx (struct de_private *de)
@@ -905,8 +906,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))
-                        printk(KERN_INFO "%s: link up, media %s\n",
-                               de->dev->name, media_name[de->media_type]);
+                        dev_info(&de->dev->dev, "link up, media %s\n",
+                                 media_name[de->media_type]);
         }
 }
 
@@ -915,7 +916,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))
-                        printk(KERN_INFO "%s: link down\n", de->dev->name);
+                        dev_info(&de->dev->dev, "link down\n");
         }
 }
 
@@ -925,7 +926,8 @@ static void de_set_media (struct de_private *de)
         u32 macmode = dr32(MacMode);
 
         if (de_is_running(de))
-                printk(KERN_WARNING "%s: chip is running while changing media!\n", de->dev->name);
+                dev_warn(&de->dev->dev,
+                         "chip is running while changing media!\n");
 
         if (de->de21040)
                 dw32(CSR11, FULL_DUPLEX_MAGIC);
@@ -945,15 +947,15 @@ static void de_set_media (struct de_private *de)
                 macmode &= ~FullDuplex;
 
         if (netif_msg_link(de)) {
-                printk(KERN_INFO
-                       "%s: set link %s\n"
-                       "%s:    mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n"
-                       "%s:    set mode 0x%x, set sia 0x%x,0x%x,0x%x\n",
-                       de->dev->name, media_name[media],
-                       de->dev->name, dr32(MacMode), dr32(SIAStatus),
-                       dr32(CSR13), dr32(CSR14), dr32(CSR15),
-                       de->dev->name, macmode, de->media[media].csr13,
-                       de->media[media].csr14, de->media[media].csr15);
+                dev_info(&de->dev->dev, "set link %s\n", media_name[media]);
+                dev_info(&de->dev->dev, "mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n",
+                         dr32(MacMode), dr32(SIAStatus),
+                         dr32(CSR13), dr32(CSR14), dr32(CSR15));
+
+                dev_info(&de->dev->dev,
+                         "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);
@@ -992,9 +994,8 @@ static void de21040_media_timer (unsigned long data)
                         de_link_up(de);
                 else
                         if (netif_msg_timer(de))
-                                printk(KERN_INFO "%s: %s link ok, status %x\n",
-                                       dev->name, media_name[de->media_type],
-                                       status);
+                                dev_info(&dev->dev, "%s link ok, status %x\n",
+                                         media_name[de->media_type], status);
                 return;
         }
 
@@ -1022,8 +1023,8 @@ no_link_yet:
         add_timer(&de->media_timer);
 
         if (netif_msg_timer(de))
-                printk(KERN_INFO "%s: no link, trying media %s, status %x\n",
-                       dev->name, media_name[de->media_type], status);
+                dev_info(&dev->dev, "no link, trying media %s, status %x\n",
+                         media_name[de->media_type], status);
 }
 
 static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media)
@@ -1079,9 +1080,10 @@ static void de21041_media_timer (unsigned long data)
                         de_link_up(de);
                 else
                         if (netif_msg_timer(de))
-                                printk(KERN_INFO "%s: %s link ok, mode %x status %x\n",
-                                       dev->name, media_name[de->media_type],
-                                       dr32(MacMode), status);
+                                dev_info(&dev->dev,
+                                         "%s link ok, mode %x status %x\n",
+                                         media_name[de->media_type],
+                                         dr32(MacMode), status);
                 return;
         }
 
@@ -1150,8 +1152,8 @@ no_link_yet:
         add_timer(&de->media_timer);
 
         if (netif_msg_timer(de))
-                printk(KERN_INFO "%s: no link, trying media %s, status %x\n",
-                       dev->name, media_name[de->media_type], status);
+                dev_info(&dev->dev, "no link, trying media %s, status %x\n",
+                         media_name[de->media_type], status);
 }
 
 static void de_media_interrupt (struct de_private *de, u32 status)
@@ -1378,8 +1380,7 @@ static int de_open (struct net_device *dev)
 
         rc = de_alloc_rings(de);
         if (rc) {
-                printk(KERN_ERR "%s: ring allocation failure, err=%d\n",
-                       dev->name, rc);
+                dev_err(&dev->dev, "ring allocation failure, err=%d\n", rc);
                 return rc;
         }
 
@@ -1387,15 +1388,14 @@ static int de_open (struct net_device *dev)
 
         rc = request_irq(dev->irq, de_interrupt, IRQF_SHARED, dev->name, dev);
         if (rc) {
-                printk(KERN_ERR "%s: IRQ %d request failure, err=%d\n",
-                       dev->name, dev->irq, rc);
+                dev_err(&dev->dev, "IRQ %d request failure, err=%d\n",
+                        dev->irq, rc);
                 goto err_out_free;
         }
 
         rc = de_init_hw(de);
         if (rc) {
-                printk(KERN_ERR "%s: h/w init failure, err=%d\n",
-                       dev->name, rc);
+                dev_err(&dev->dev, "h/w init failure, err=%d\n", rc);
                 goto err_out_free_irq;
         }
 
@@ -1666,8 +1666,8 @@ static int de_nway_reset(struct net_device *dev)
         status = dr32(SIAStatus);
         dw32(SIAStatus, (status & ~NWayState) | NWayRestart);
         if (netif_msg_link(de))
-                printk(KERN_INFO "%s: link nway restart, status %x,%x\n",
-                       de->dev->name, status, dr32(SIAStatus));
+                dev_info(&de->dev->dev, "link nway restart, status %x,%x\n",
+                         status, dr32(SIAStatus));
         return 0;
 }
 
@@ -1711,7 +1711,7 @@ static void __devinit de21040_get_mac_address (struct de_private *de)
                 de->dev->dev_addr[i] = value;
                 udelay(1);
                 if (boguscnt <= 0)
-                        printk(KERN_WARNING PFX "timeout reading 21040 MAC address byte %u\n", i);
+                        pr_warning(PFX "timeout reading 21040 MAC address byte %u\n", i);
         }
 }
 
@@ -1830,9 +1830,8 @@ static void __devinit de21041_get_srom_info (struct de_private *de)
         }
 
         if (netif_msg_probe(de))
-                printk(KERN_INFO "de%d: SROM leaf offset %u, default media %s\n",
-                       de->board_idx, ofs,
-                       media_name[de->media_type]);
+                pr_info("de%d: SROM leaf offset %u, default media %s\n",
+                       de->board_idx, ofs, media_name[de->media_type]);
 
         /* init SIA register values to defaults */
         for (i = 0; i < DE_MAX_MEDIA; i++) {
@@ -1879,9 +1878,9 @@ static void __devinit de21041_get_srom_info (struct de_private *de)
                 de->media[idx].type = idx;
 
                 if (netif_msg_probe(de))
-                        printk(KERN_INFO "de%d:   media block #%u: %s",
-                               de->board_idx, i,
-                               media_name[de->media[idx].type]);
+                        pr_info("de%d:   media block #%u: %s",
+                                de->board_idx, i,
+                                media_name[de->media[idx].type]);
 
                 bufp += sizeof (ib->opts);
 
@@ -1893,13 +1892,13 @@ static void __devinit de21041_get_srom_info (struct de_private *de)
                                 sizeof(ib->csr15);
 
                         if (netif_msg_probe(de))
-                                printk(" (%x,%x,%x)\n",
-                                       de->media[idx].csr13,
-                                       de->media[idx].csr14,
-                                       de->media[idx].csr15);
+                                pr_cont(" (%x,%x,%x)\n",
+                                        de->media[idx].csr13,
+                                        de->media[idx].csr14,
+                                        de->media[idx].csr15);
 
                 } else if (netif_msg_probe(de))
-                        printk("\n");
+                        pr_cont("\n");
 
                 if (bufp > ((void *)&ee_data[DE_EEPROM_SIZE - 3]))
                         break;
@@ -2005,7 +2004,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
         /* check for invalid IRQ value */
         if (pdev->irq < 2) {
                 rc = -EIO;
-                printk(KERN_ERR PFX "invalid irq (%d) for pci dev %s\n",
+                pr_err(PFX "invalid irq (%d) for pci dev %s\n",
                        pdev->irq, pci_name(pdev));
                 goto err_out_res;
         }
@@ -2016,14 +2015,14 @@ static int __devinit de_init_one (struct pci_dev *pdev,
         pciaddr = pci_resource_start(pdev, 1);
         if (!pciaddr) {
                 rc = -EIO;
-                printk(KERN_ERR PFX "no MMIO resource for pci dev %s\n",
-                       pci_name(pdev));
+                pr_err(PFX "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;
-                printk(KERN_ERR PFX "MMIO resource (%llx) too small on pci dev %s\n",
-                       (unsigned long long)pci_resource_len(pdev, 1), pci_name(pdev));
+                pr_err(PFX "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;
         }
 
@@ -2031,9 +2030,9 @@ static int __devinit de_init_one (struct pci_dev *pdev,
         regs = ioremap_nocache(pciaddr, DE_REGS_SIZE);
         if (!regs) {
                 rc = -EIO;
-                printk(KERN_ERR PFX "Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n",
-                        (unsigned long long)pci_resource_len(pdev, 1),
-                        pciaddr, pci_name(pdev));
+                pr_err(PFX "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;
         }
         dev->base_addr = (unsigned long) regs;
@@ -2044,8 +2043,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
         /* make sure hardware is not running */
         rc = de_reset_mac(de);
         if (rc) {
-                printk(KERN_ERR PFX "Cannot reset MAC, pci dev %s\n",
-                       pci_name(pdev));
+                pr_err(PFX "Cannot reset MAC, pci dev %s\n", pci_name(pdev));
                 goto err_out_iomap;
         }
 
@@ -2065,12 +2063,11 @@ static int __devinit de_init_one (struct pci_dev *pdev,
                 goto err_out_iomap;
 
         /* print info about board and interface just registered */
-        printk (KERN_INFO "%s: %s at 0x%lx, %pM, IRQ %d\n",
-                dev->name,
-                de->de21040 ? "21040" : "21041",
-                dev->base_addr,
-                dev->dev_addr,
-                dev->irq);
+        dev_info(&dev->dev, "%s at 0x%lx, %pM, IRQ %d\n",
+                 de->de21040 ? "21040" : "21041",
+                 dev->base_addr,
+                 dev->dev_addr,
+                 dev->irq);
 
         pci_set_drvdata(pdev, dev);
 
@@ -2158,8 +2155,7 @@ static int de_resume (struct pci_dev *pdev)
         if (!netif_running(dev))
                 goto out_attach;
         if ((retval = pci_enable_device(pdev))) {
-                printk (KERN_ERR "%s: pci_enable_device failed in resume\n",
-                        dev->name);
+                dev_err(&dev->dev, "pci_enable_device failed in resume\n");
                 goto out;
         }
         de_init_hw(de);