Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

[sfrench/cifs-2.6.git] / drivers / net / wd.c

diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index 7f38012b9c92e2ddb094f3c53240c90850744563..fa14255282afe96770d5b44cc887fbaba22814df 100644 (file)
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -93,8 +93,6 @@ static int __init do_wd_probe(struct net_device *dev)
        int mem_start = dev->mem_start;
        int mem_end = dev->mem_end;
 
-       SET_MODULE_OWNER(dev);
-
        if (base_addr > 0x1ff) {        /* Check a user specified location. */
                r = request_region(base_addr, WD_IO_EXTENT, "wd-probe");
                if ( r == NULL)
@@ -158,6 +156,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
        int word16 = 0;                         /* 0 = 8 bit, 1 = 16 bit */
        const char *model_name;
        static unsigned version_printed;
+       DECLARE_MAC_BUF(mac);
 
        for (i = 0; i < 8; i++)
                checksum += inb(ioaddr + 8 + i);
@@ -176,9 +175,11 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
        if (ei_debug  &&  version_printed++ == 0)
                printk(version);
 
-       printk("%s: WD80x3 at %#3x,", dev->name, ioaddr);
        for (i = 0; i < 6; i++)
-               printk(" %2.2X", dev->dev_addr[i] = inb(ioaddr + 8 + i));
+               dev->dev_addr[i] = inb(ioaddr + 8 + i);
+
+       printk("%s: WD80x3 at %#3x, %s",
+              dev->name, ioaddr, print_mac(mac, dev->dev_addr));
 
        /* The following PureData probe code was contributed by
           Mike Jagdis <jaggy@purplet.demon.co.uk>. Puredata does software
@@ -433,7 +434,7 @@ wd_block_input(struct net_device *dev, int count, struct sk_buff *skb, int ring_
                memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count);
        } else {
                /* Packet is in one chunk -- we can copy + cksum. */
-               eth_io_copy_and_sum(skb, xfer_start, count, 0);
+               memcpy_fromio(skb->data, xfer_start, count);
        }
 
        /* Turn off 16 bit access so that reboot works.  ISA brain-damage */