fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / net / es3210.c

diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c
index 96866a4..2d2ea94 100644 (file)
--- a/drivers/net/es3210.c
+++ b/drivers/net/es3210.c
@@ -155,12 +155,6 @@ static int __init do_es_probe(struct net_device *dev)
        return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-       free_irq(dev->irq, dev);
-       release_region(dev->base_addr, ES_IO_EXTENT);
-}
-
 #ifndef MODULE
 struct net_device * __init es_probe(int unit)
 {
@@ -176,12 +170,7 @@ struct net_device * __init es_probe(int unit)
        err = do_es_probe(dev);
        if (err)
                goto out;
-       err = register_netdev(dev);
-       if (err)
-               goto out1;
        return dev;
-out1:
-       cleanup_card(dev);
 out:
        free_netdev(dev);
        return ERR_PTR(err);
@@ -271,9 +260,14 @@ static int __init es_probe1(struct net_device *dev, int ioaddr)
                printk(" assigning ");
        }
 
-       dev->mem_end = ei_status.rmem_end = dev->mem_start
-               + (ES_STOP_PG - ES_START_PG)*256;
-       ei_status.rmem_start = dev->mem_start + TX_PAGES*256;
+       ei_status.mem = ioremap(dev->mem_start, (ES_STOP_PG - ES_START_PG)*256);
+       if (!ei_status.mem) {
+               printk("ioremap failed - giving up\n");
+               retval = -ENXIO;
+               goto out1;
+       }
+
+       dev->mem_end = dev->mem_start + (ES_STOP_PG - ES_START_PG)*256;
 
        printk("mem %#lx-%#lx\n", dev->mem_start, dev->mem_end-1);
 
@@ -304,6 +298,10 @@ static int __init es_probe1(struct net_device *dev, int ioaddr)
        dev->poll_controller = ei_poll;
 #endif
        NS8390_init(dev, 0);
+
+       retval = register_netdev(dev);
+       if (retval)
+               goto out1;
        return 0;
 out1:
        free_irq(dev->irq, dev);
@@ -353,8 +351,8 @@ static void es_reset_8390(struct net_device *dev)
 static void
 es_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page)
 {
-       unsigned long hdr_start = dev->mem_start + ((ring_page - ES_START_PG)<<8);
-       isa_memcpy_fromio(hdr, hdr_start, sizeof(struct e8390_pkt_hdr));
+       void __iomem *hdr_start = ei_status.mem + ((ring_page - ES_START_PG)<<8);
+       memcpy_fromio(hdr, hdr_start, sizeof(struct e8390_pkt_hdr));
        hdr->count = (hdr->count + 3) & ~3;     /* Round up allocation. */
 }
 
@@ -367,27 +365,27 @@ es_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page
 static void es_block_input(struct net_device *dev, int count, struct sk_buff *skb,
                                                  int ring_offset)
 {
-       unsigned long xfer_start = dev->mem_start + ring_offset - (ES_START_PG<<8);
+       void __iomem *xfer_start = ei_status.mem + ring_offset - ES_START_PG*256;
 
-       if (xfer_start + count > ei_status.rmem_end) {
+       if (ring_offset + count > ES_STOP_PG*256) {
                /* Packet wraps over end of ring buffer. */
-               int semi_count = ei_status.rmem_end - xfer_start;
-               isa_memcpy_fromio(skb->data, xfer_start, semi_count);
+               int semi_count = ES_STOP_PG*256 - ring_offset;
+               memcpy_fromio(skb->data, xfer_start, semi_count);
                count -= semi_count;
-               isa_memcpy_fromio(skb->data + semi_count, ei_status.rmem_start, count);
+               memcpy_fromio(skb->data + semi_count, ei_status.mem, count);
        } else {
                /* Packet is in one chunk. */
-               isa_eth_io_copy_and_sum(skb, xfer_start, count, 0);
+               eth_io_copy_and_sum(skb, xfer_start, count, 0);
        }
 }
 
 static void es_block_output(struct net_device *dev, int count,
                                const unsigned char *buf, int start_page)
 {
-       unsigned long shmem = dev->mem_start + ((start_page - ES_START_PG)<<8);
+       void __iomem *shmem = ei_status.mem + ((start_page - ES_START_PG)<<8);
 
        count = (count + 3) & ~3;     /* Round up to doubleword */
-       isa_memcpy_toio(shmem, buf, count);
+       memcpy_toio(shmem, buf, count);
 }
 
 static int es_open(struct net_device *dev)
@@ -423,8 +421,7 @@ MODULE_PARM_DESC(mem, "memory base address(es)");
 MODULE_DESCRIPTION("Racal-Interlan ES3210 EISA ethernet driver");
 MODULE_LICENSE("GPL");
 
-int
-init_module(void)
+int __init init_module(void)
 {
        struct net_device *dev;
        int this_dev, found = 0;
@@ -439,11 +436,8 @@ init_module(void)
                dev->base_addr = io[this_dev];
                dev->mem_start = mem[this_dev];
                if (do_es_probe(dev) == 0) {
-                       if (register_netdev(dev) == 0) {
-                               dev_es3210[found++] = dev;
-                               continue;
-                       }
-                       cleanup_card(dev);
+                       dev_es3210[found++] = dev;
+                       continue;
                }
                free_netdev(dev);
                printk(KERN_WARNING "es3210.c: No es3210 card found (i/o = 0x%x).\n", io[this_dev]);
@@ -454,7 +448,14 @@ init_module(void)
        return -ENXIO;
 }
 
-void
+static void cleanup_card(struct net_device *dev)
+{
+       free_irq(dev->irq, dev);
+       release_region(dev->base_addr, ES_IO_EXTENT);
+       iounmap(ei_status.mem);
+}
+
+void __exit
 cleanup_module(void)
 {
        int this_dev;