Merge branch 'devel' into next

[linux-2.6-omap-h63xx.git] / drivers / net / tokenring / abyss.c

diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index 1bdd3beefbe54cf17121d1296e5d18dbfed3ac04..b566d6d79ecdbe7ce0a5f58f7546f50e77600ec5 100644 (file)
--- a/drivers/net/tokenring/abyss.c
+++ b/drivers/net/tokenring/abyss.c
@@ -10,7 +10,7 @@
  *      - Madge Smart 16/4 PCI Mk2
  *
  *  Maintainer(s):
- *    AF       Adam Fritzler           mid@auk.cx
+ *    AF       Adam Fritzler
  *
  *  Modification History:
  *     30-Dec-99       AF      Split off from the tms380tr driver.
@@ -97,7 +97,7 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
        static int versionprinted;
        struct net_device *dev;
        struct net_local *tp;
-       int i, ret, pci_irq_line;
+       int ret, pci_irq_line;
        unsigned long pci_ioaddr;
        
        if (versionprinted++ == 0)
@@ -116,8 +116,6 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
        if (!dev)
                return -ENOMEM;
 
-       SET_MODULE_OWNER(dev);
-
        if (!request_region(pci_ioaddr, ABYSS_IO_EXTENT, dev->name)) {
                ret = -EBUSY;
                goto err_out_trdev;
@@ -147,12 +145,8 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
        }
 
        abyss_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: %pM\n", dev->name, dev->dev_addr);
 
        tp = netdev_priv(dev);
        tp->setnselout = abyss_setnselout_pins;