igb: add DCA support

[linux-2.6] / drivers / net / tokenring / tmspci.c

diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index ab47c05..5f0ee88 100644 (file)
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -14,7 +14,7 @@
  *      - 3Com 3C339 Token Link Velocity
  *
  *  Maintainer(s):
- *    AF       Adam Fritzler           mid@auk.cx
+ *    AF       Adam Fritzler
  *
  *  Modification History:
  *     30-Dec-99       AF      Split off from the tms380tr driver.
@@ -96,10 +96,11 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
        static int versionprinted;
        struct net_device *dev;
        struct net_local *tp;
-       int i, ret;
+       int ret;
        unsigned int pci_irq_line;
        unsigned long pci_ioaddr;
        struct card_info *cardinfo = &card_info_table[ent->driver_data];
+       DECLARE_MAC_BUF(mac);
 
        if (versionprinted++ == 0)
                printk("%s", version);
@@ -115,14 +116,13 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
        dev = alloc_trdev(sizeof(struct net_local));
        if (!dev)
                return -ENOMEM;
-       SET_MODULE_OWNER(dev);
 
        if (!request_region(pci_ioaddr, TMS_PCI_IO_EXTENT, dev->name)) {
                ret = -EBUSY;
                goto err_out_trdev;
        }
 
-       ret = request_irq(pdev->irq, tms380tr_interrupt, SA_SHIRQ,
+       ret = request_irq(pdev->irq, tms380tr_interrupt, IRQF_SHARED,
                          dev->name, dev);
        if (ret)
                goto err_out_region;
@@ -137,11 +137,8 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
                
        tms_pci_read_eeprom(dev);
 
-       printk("%s:    Ring Station Address: ", dev->name);
-       printk("%2.2x", dev->dev_addr[0]);
-       for (i = 1; i < 6; i++)
-               printk(":%2.2x", dev->dev_addr[i]);
-       printk("\n");
+       printk("%s:    Ring Station Address: %s\n",
+              dev->name, print_mac(mac, dev->dev_addr));
                
        ret = tmsdev_init(dev, &pdev->dev);
        if (ret) {
@@ -149,7 +146,7 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
                goto err_out_irq;
        }
 
-       tp = dev->priv;
+       tp = netdev_priv(dev);
        tp->setnselout = tms_pci_setnselout_pins;
                
        tp->sifreadb = tms_pci_sifreadb;
@@ -210,7 +207,7 @@ static void tms_pci_read_eeprom(struct net_device *dev)
 static unsigned short tms_pci_setnselout_pins(struct net_device *dev)
 {
        unsigned short val = 0;
-       struct net_local *tp = dev->priv;
+       struct net_local *tp = netdev_priv(dev);
        struct card_info *cardinfo = tp->tmspriv;
   
        if(tp->DataRate == SPEED_4)
@@ -224,8 +221,7 @@ static void __devexit tms_pci_detach (struct pci_dev *pdev)
 {
        struct net_device *dev = pci_get_drvdata(pdev);
 
-       if (!dev)
-               BUG();
+       BUG_ON(!dev);
        unregister_netdev(dev);
        release_region(dev->base_addr, TMS_PCI_IO_EXTENT);
        free_irq(dev->irq, dev);