ibm_newemac: Cleanup/Fix RGMII MDIO support detection

[linux-2.6-omap-h63xx.git] / drivers / net / 3c515.c

diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 290166d5e7d1c7929fb238aa5718e74e3bb5771a..275e7510ebaf64a67e2835f1adbdfc978cadc1a5 100644 (file)
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -501,8 +501,6 @@ static struct net_device *corkscrew_scan(int unit)
                netdev_boot_setup_check(dev);
        }
 
-       SET_MODULE_OWNER(dev);
-
 #ifdef __ISAPNP__
        if(nopnp == 1)
                goto no_pnp;
@@ -571,6 +569,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
        unsigned int eeprom[0x40], checksum = 0;        /* EEPROM contents */
        int i;
        int irq;
+       DECLARE_MAC_BUF(mac);
 
        if (idev) {
                irq = pnp_irq(idev, 0);
@@ -632,8 +631,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
        checksum = (checksum ^ (checksum >> 8)) & 0xff;
        if (checksum != 0x00)
                printk(" ***INVALID CHECKSUM %4.4x*** ", checksum);
-       for (i = 0; i < 6; i++)
-               printk("%c%2.2x", i ? ':' : ' ', dev->dev_addr[i]);
+       printk(" %s", print_mac(mac, dev->dev_addr));
        if (eeprom[16] == 0x11c7) {     /* Corkscrew */
                if (request_dma(dev->dma, "3c515")) {
                        printk(", DMA %d allocation failed", dev->dma);