linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / hp-plus.c

diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c
index e26a3e4..74e167e 100644 (file)
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/hp-plus.c
@@ -250,12 +250,6 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
                ei_status.block_output = &hpp_mem_block_output;
                ei_status.get_8390_hdr = &hpp_mem_get_8390_hdr;
                dev->mem_start = mem_start;
-               ei_status.mem = ioremap(mem_start,
-                                       (HP_STOP_PG - HP_START_PG)*256);
-               if (!ei_status.mem) {
-                       retval = -ENOMEM;
-                       goto out;
-               }
                ei_status.rmem_start = dev->mem_start + TX_PAGES/2*256;
                dev->mem_end = ei_status.rmem_end
                        = dev->mem_start + (HP_STOP_PG - HP_START_PG)*256;
@@ -268,10 +262,8 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
 
        retval = register_netdev(dev);
        if (retval)
-               goto out1;
+               goto out;
        return 0;
-out1:
-       iounmap(ei_status.mem);
 out:
        release_region(ioaddr, HP_IO_EXTENT);
        return retval;
@@ -380,7 +372,7 @@ hpp_mem_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring
 
        outw((ring_page<<8), ioaddr + HPP_IN_ADDR);
        outw(option_reg & ~(MemDisable + BootROMEnb), ioaddr + HPP_OPTION);
-       memcpy_fromio(hdr, ei_status.mem, sizeof(struct e8390_pkt_hdr));
+       isa_memcpy_fromio(hdr, dev->mem_start, sizeof(struct e8390_pkt_hdr));
        outw(option_reg, ioaddr + HPP_OPTION);
        hdr->count = (le16_to_cpu(hdr->count) + 3) & ~3;        /* Round up allocation. */
 }
@@ -399,7 +391,7 @@ hpp_mem_block_input(struct net_device *dev, int count, struct sk_buff *skb, int
           Also note that we *can't* use eth_io_copy_and_sum() because
           it will not always copy "count" bytes (e.g. padded IP).  */
 
-       memcpy_fromio(skb->data, ei_status.mem, count);
+       isa_memcpy_fromio(skb->data, dev->mem_start, count);
        outw(option_reg, ioaddr + HPP_OPTION);
 }
 
@@ -424,7 +416,7 @@ hpp_mem_block_output(struct net_device *dev, int count,
 
        outw(start_page << 8, ioaddr + HPP_OUT_ADDR);
        outw(option_reg & ~(MemDisable + BootROMEnb), ioaddr + HPP_OPTION);
-       memcpy_toio(ei_status.mem, buf, (count + 3) & ~3);
+       isa_memcpy_toio(dev->mem_start, buf, (count + 3) & ~3);
        outw(option_reg, ioaddr + HPP_OPTION);
 
        return;
@@ -446,7 +438,7 @@ MODULE_LICENSE("GPL");
 
 /* This is set up so that only a single autoprobe takes place per call.
 ISA device autoprobes on a running machine are not recommended. */
-int __init
+int
 init_module(void)
 {
        struct net_device *dev;
@@ -478,7 +470,6 @@ init_module(void)
 static void cleanup_card(struct net_device *dev)
 {
        /* NB: hpp_close() handles free_irq */
-       iounmap(ei_status.mem);
        release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);
 }