1 files changed, 44 insertions, 85 deletions

diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index c683f77c6f42..34c5e1cbf65d 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -62,13 +62,15 @@ invalid ramWidth is Very Bad.
 V. References
 
 http://www.scyld.com/expert/NWay.html
-http://www.national.com/pf/DP/DP83840.html
+http://www.national.com/opf/DP/DP83840A.html
 
 Thanks to Terry Murphy of 3Com for providing development information for
 earlier 3Com products.
 
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -83,11 +85,9 @@ earlier 3Com products.
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
 #include <linux/ioport.h>
-#include <linux/ethtool.h>
 #include <linux/bitops.h>
 #include <linux/mii.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ciscode.h>
@@ -238,7 +238,6 @@ static int el3_rx(struct net_device *dev, int worklimit);
 static int el3_close(struct net_device *dev);
 static void el3_tx_timeout(struct net_device *dev);
 static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-static const struct ethtool_ops netdev_ethtool_ops;
 static void set_rx_mode(struct net_device *dev);
 static void set_multicast_list(struct net_device *dev);
 
@@ -280,25 +279,14 @@ static int tc574_probe(struct pcmcia_device *link)
         spin_lock_init(&lp->window_lock);
         link->resource[0]->end = 32;
         link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
-        link->conf.Attributes = CONF_ENABLE_IRQ;
-        link->conf.IntType = INT_MEMORY_AND_IO;
-        link->conf.ConfigIndex = 1;
+        link->config_flags |= CONF_ENABLE_IRQ;
+        link->config_index = 1;
 
         dev->netdev_ops = &el3_netdev_ops;
-        SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
         dev->watchdog_timeo = TX_TIMEOUT;
 
         return tc574_config(link);
-} /* tc574_attach */
-
-/*
-
-        This deletes a driver "instance".  The device is de-registered
-        with Card Services.  If it has been released, all local data
-        structures are freed.  Otherwise, the structures will be freed
-        when the device is released.
-
-*/
+}
 
 static void tc574_detach(struct pcmcia_device *link)
 {
@@ -313,12 +301,6 @@ static void tc574_detach(struct pcmcia_device *link)
         free_netdev(dev);
 } /* tc574_detach */
 
-/*
-        tc574_config() is scheduled to run after a CARD_INSERTION event
-        is received, to configure the PCMCIA socket, and to make the
-        ethernet device available to the system.
-*/
-
 static const char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
 
 static int tc574_config(struct pcmcia_device *link)
@@ -352,7 +334,7 @@ static int tc574_config(struct pcmcia_device *link)
         if (ret)
                 goto failed;
 
-        ret = pcmcia_request_configuration(link, &link->conf);
+        ret = pcmcia_enable_device(link);
         if (ret)
                 goto failed;
 
@@ -376,8 +358,8 @@ static int tc574_config(struct pcmcia_device *link)
                 for (i = 0; i < 3; i++)
                         phys_addr[i] = htons(read_eeprom(ioaddr, i + 10));
                 if (phys_addr[0] == htons(0x6060)) {
-                        printk(KERN_NOTICE "3c574_cs: IO port conflict at 0x%03lx"
-                                   "-0x%03lx\n", dev->base_addr, dev->base_addr+15);
+                        pr_notice("IO port conflict at 0x%03lx-0x%03lx\n",
+                                  dev->base_addr, dev->base_addr+15);
                         goto failed;
                 }
         }
@@ -391,7 +373,7 @@ static int tc574_config(struct pcmcia_device *link)
                 outw(2<<11, ioaddr + RunnerRdCtrl);
                 mcr = inb(ioaddr + 2);
                 outw(0<<11, ioaddr + RunnerRdCtrl);
-                printk(KERN_INFO "  ASIC rev %d,", mcr>>3);
+                pr_info("  ASIC rev %d,", mcr>>3);
                 EL3WINDOW(3);
                 config = inl(ioaddr + Wn3_Config);
                 lp->default_media = (config & Xcvr) >> Xcvr_shift;
@@ -428,7 +410,7 @@ static int tc574_config(struct pcmcia_device *link)
                         }
                 }
                 if (phy > 32) {
-                        printk(KERN_NOTICE "  No MII transceivers found!\n");
+                        pr_notice("  No MII transceivers found!\n");
                         goto failed;
                 }
                 i = mdio_read(ioaddr, lp->phys, 16) | 0x40;
@@ -444,18 +426,16 @@ static int tc574_config(struct pcmcia_device *link)
         SET_NETDEV_DEV(dev, &link->dev);
 
         if (register_netdev(dev) != 0) {
-                printk(KERN_NOTICE "3c574_cs: register_netdev() failed\n");
+                pr_notice("register_netdev() failed\n");
                 goto failed;
         }
 
-        printk(KERN_INFO "%s: %s at io %#3lx, irq %d, "
-               "hw_addr %pM.\n",
-               dev->name, cardname, dev->base_addr, dev->irq,
-               dev->dev_addr);
-        printk(" %dK FIFO split %s Rx:Tx, %sMII interface.\n",
-                   8 << config & Ram_size,
-                   ram_split[(config & Ram_split) >> Ram_split_shift],
-                   config & Autoselect ? "autoselect " : "");
+        netdev_info(dev, "%s at io %#3lx, irq %d, hw_addr %pM\n",
+                    cardname, dev->base_addr, dev->irq, dev->dev_addr);
+        netdev_info(dev, " %dK FIFO split %s Rx:Tx, %sMII interface.\n",
+                    8 << config & Ram_size,
+                    ram_split[(config & Ram_split) >> Ram_split_shift],
+                    config & Autoselect ? "autoselect " : "");
 
         return 0;
 
@@ -465,12 +445,6 @@ failed:
 
 } /* tc574_config */
 
-/*
-        After a card is removed, tc574_release() will unregister the net
-        device, and release the PCMCIA configuration.  If the device is
-        still open, this will be postponed until it is closed.
-*/
-
 static void tc574_release(struct pcmcia_device *link)
 {
         pcmcia_disable_device(link);
@@ -502,14 +476,14 @@ static void dump_status(struct net_device *dev)
 {
         unsigned int ioaddr = dev->base_addr;
         EL3WINDOW(1);
-        printk(KERN_INFO "  irq status %04x, rx status %04x, tx status "
-                   "%02x, tx free %04x\n", inw(ioaddr+EL3_STATUS),
-                   inw(ioaddr+RxStatus), inb(ioaddr+TxStatus),
-                   inw(ioaddr+TxFree));
+        netdev_info(dev, "  irq status %04x, rx status %04x, tx status %02x, tx free %04x\n",
+                    inw(ioaddr+EL3_STATUS),
+                    inw(ioaddr+RxStatus), inb(ioaddr+TxStatus),
+                    inw(ioaddr+TxFree));
         EL3WINDOW(4);
-        printk(KERN_INFO "  diagnostics: fifo %04x net %04x ethernet %04x"
-                   " media %04x\n", inw(ioaddr+0x04), inw(ioaddr+0x06),
-                   inw(ioaddr+0x08), inw(ioaddr+0x0a));
+        netdev_info(dev, "  diagnostics: fifo %04x net %04x ethernet %04x media %04x\n",
+                    inw(ioaddr+0x04), inw(ioaddr+0x06),
+                    inw(ioaddr+0x08), inw(ioaddr+0x0a));
         EL3WINDOW(1);
 }
 
@@ -523,7 +497,7 @@ static void tc574_wait_for_completion(struct net_device *dev, int cmd)
         while (--i > 0)
                 if (!(inw(dev->base_addr + EL3_STATUS) & 0x1000)) break;
         if (i == 0)
-                printk(KERN_NOTICE "%s: command 0x%04x did not complete!\n", dev->name, cmd);
+                netdev_notice(dev, "command 0x%04x did not complete!\n", cmd);
 }
 
 /* Read a word from the EEPROM using the regular EEPROM access register.
@@ -710,7 +684,7 @@ static int el3_open(struct net_device *dev)
         netif_start_queue(dev);
         
         tc574_reset(dev);
-        lp->media.function = &media_check;
+        lp->media.function = media_check;
         lp->media.data = (unsigned long) dev;
         lp->media.expires = jiffies + HZ;
         add_timer(&lp->media);
@@ -725,7 +699,7 @@ static void el3_tx_timeout(struct net_device *dev)
 {
         unsigned int ioaddr = dev->base_addr;
         
-        printk(KERN_NOTICE "%s: Transmit timed out!\n", dev->name);
+        netdev_notice(dev, "Transmit timed out!\n");
         dump_status(dev);
         dev->stats.tx_errors++;
         dev->trans_start = jiffies; /* prevent tx timeout */
@@ -848,8 +822,8 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id)
                                 EL3WINDOW(4);
                                 fifo_diag = inw(ioaddr + Wn4_FIFODiag);
                                 EL3WINDOW(1);
-                                printk(KERN_NOTICE "%s: adapter failure, FIFO diagnostic"
-                                           " register %04x.\n", dev->name, fifo_diag);
+                                netdev_notice(dev, "adapter failure, FIFO diagnostic register %04x\n",
+                                              fifo_diag);
                                 if (fifo_diag & 0x0400) {
                                         /* Tx overrun */
                                         tc574_wait_for_completion(dev, TxReset);
@@ -903,7 +877,7 @@ static void media_check(unsigned long arg)
            this, we can limp along even if the interrupt is blocked */
         if ((inw(ioaddr + EL3_STATUS) & IntLatch) && (inb(ioaddr + Timer) == 0xff)) {
                 if (!lp->fast_poll)
-                        printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name);
+                        netdev_info(dev, "interrupt(s) dropped!\n");
 
                 local_irq_save(flags);
                 el3_interrupt(dev->irq, dev);
@@ -926,23 +900,21 @@ static void media_check(unsigned long arg)
         
         if (media != lp->media_status) {
                 if ((media ^ lp->media_status) & 0x0004)
-                        printk(KERN_INFO "%s: %s link beat\n", dev->name,
-                                   (lp->media_status & 0x0004) ? "lost" : "found");
+                        netdev_info(dev, "%s link beat\n",
+                                    (lp->media_status & 0x0004) ? "lost" : "found");
                 if ((media ^ lp->media_status) & 0x0020) {
                         lp->partner = 0;
                         if (lp->media_status & 0x0020) {
-                                printk(KERN_INFO "%s: autonegotiation restarted\n",
-                                           dev->name);
+                                netdev_info(dev, "autonegotiation restarted\n");
                         } else if (partner) {
                                 partner &= lp->advertising;
                                 lp->partner = partner;
-                                printk(KERN_INFO "%s: autonegotiation complete: "
-                                           "%sbaseT-%cD selected\n", dev->name,
-                                           ((partner & 0x0180) ? "100" : "10"),
-                                           ((partner & 0x0140) ? 'F' : 'H'));
+                                netdev_info(dev, "autonegotiation complete: "
+                                            "%dbaseT-%cD selected\n",
+                                            (partner & 0x0180) ? 100 : 10,
+                                            (partner & 0x0140) ? 'F' : 'H');
                         } else {
-                                printk(KERN_INFO "%s: link partner did not autonegotiate\n",
-                                           dev->name);
+                                netdev_info(dev, "link partner did not autonegotiate\n");
                         }
 
                         EL3WINDOW(3);
@@ -952,10 +924,9 @@ static void media_check(unsigned long arg)
 
                 }
                 if (media & 0x0010)
-                        printk(KERN_INFO "%s: remote fault detected\n",
-                                   dev->name);
+                        netdev_info(dev, "remote fault detected\n");
                 if (media & 0x0002)
-                        printk(KERN_INFO "%s: jabber detected\n", dev->name);
+                        netdev_info(dev, "jabber detected\n");
                 lp->media_status = media;
         }
         spin_unlock_irqrestore(&lp->window_lock, flags);
@@ -979,7 +950,7 @@ static struct net_device_stats *el3_get_stats(struct net_device *dev)
 }
 
 /*  Update statistics.
-        Suprisingly this need not be run single-threaded, but it effectively is.
+        Surprisingly this need not be run single-threaded, but it effectively is.
         The counters clear when read, so the adds must merely be atomic.
  */
 static void update_stats(struct net_device *dev)
@@ -1065,16 +1036,6 @@ static int el3_rx(struct net_device *dev, int worklimit)
         return worklimit;
 }
 
-static void netdev_get_drvinfo(struct net_device *dev,
-                               struct ethtool_drvinfo *info)
-{
-        strcpy(info->driver, "3c574_cs");
-}
-
-static const struct ethtool_ops netdev_ethtool_ops = {
-        .get_drvinfo            = netdev_get_drvinfo,
-};
-
 /* Provide ioctl() calls to examine the MII xcvr state. */
 static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
@@ -1189,7 +1150,7 @@ static int el3_close(struct net_device *dev)
         return 0;
 }
 
-static struct pcmcia_device_id tc574_ids[] = {
+static const struct pcmcia_device_id tc574_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0574),
         PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0101, 0x0556, "cis/3CCFEM556.cis"),
         PCMCIA_DEVICE_NULL,
@@ -1198,9 +1159,7 @@ MODULE_DEVICE_TABLE(pcmcia, tc574_ids);
 
 static struct pcmcia_driver tc574_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "3c574_cs",
-        },
+        .name           = "3c574_cs",
         .probe          = tc574_probe,
         .remove         = tc574_detach,
         .id_table       = tc574_ids,