3 files changed, 5 insertions, 24 deletions

diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c
index f075cebe84ad..f21148e7b579 100644
--- a/drivers/net/arm/ether1.c
+++ b/drivers/net/arm/ether1.c
@@ -1014,8 +1014,7 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
         SET_NETDEV_DEV(dev, &ec->dev);
 
         dev->irq = ec->irq;
-        priv(dev)->base = ioremap(ecard_resource_start(ec, ECARD_RES_IOCFAST),
-                                  ecard_resource_len(ec, ECARD_RES_IOCFAST));
+        priv(dev)->base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
         if (!priv(dev)->base) {
                 ret = -ENOMEM;
                 goto free;
@@ -1056,8 +1055,6 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
         return 0;
 
  free:
-        if (priv(dev)->base)
-                iounmap(priv(dev)->base);
         free_netdev(dev);
  release:
         ecard_release_resources(ec);
@@ -1072,7 +1069,6 @@ static void __devexit ether1_remove(struct expansion_card *ec)
         ecard_set_drvdata(ec, NULL);    
 
         unregister_netdev(dev);
-        iounmap(priv(dev)->base);
         free_netdev(dev);
         ecard_release_resources(ec);
 }
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index 32da2eb9bcee..da713500654d 100644
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -793,8 +793,7 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
         SET_MODULE_OWNER(dev);
         SET_NETDEV_DEV(dev, &ec->dev);
 
-        priv(dev)->base = ioremap(ecard_resource_start(ec, ECARD_RES_MEMC),
-                                  ecard_resource_len(ec, ECARD_RES_MEMC));
+        priv(dev)->base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
         if (!priv(dev)->base) {
                 ret = -ENOMEM;
                 goto free;
@@ -869,8 +868,6 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
         return 0;
 
  free:
-        if (priv(dev)->base)
-                iounmap(priv(dev)->base);
         free_netdev(dev);
  release:
         ecard_release_resources(ec);
@@ -885,7 +882,6 @@ static void __devexit ether3_remove(struct expansion_card *ec)
         ecard_set_drvdata(ec, NULL);
 
         unregister_netdev(dev);
-        iounmap(priv(dev)->base);
         free_netdev(dev);
         ecard_release_resources(ec);
 }
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index 61f574aa3a99..769ba69451f4 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -686,7 +686,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
         eh->supported           = data->supported;
         eh->ctrl                = 0;
         eh->id                  = ec->cid.product;
-        eh->memc                = ioremap(ecard_resource_start(ec, ECARD_RES_MEMC), PAGE_SIZE);
+        eh->memc                = ecardm_iomap(ec, ECARD_RES_MEMC, 0, PAGE_SIZE);
         if (!eh->memc) {
                 ret = -ENOMEM;
                 goto free;
@@ -694,7 +694,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
 
         eh->ctrl_port = eh->memc;
         if (data->ctrl_ioc) {
-                eh->ioc_fast = ioremap(ecard_resource_start(ec, ECARD_RES_IOCFAST), PAGE_SIZE);
+                eh->ioc_fast = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, PAGE_SIZE);
                 if (!eh->ioc_fast) {
                         ret = -ENOMEM;
                         goto free;
@@ -710,8 +710,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
          * IRQ and control port handling - only for non-NIC slot cards.
          */
         if (ec->slot_no != 8) {
-                ec->ops         = &etherh_ops;
-                ec->irq_data    = eh;
+                ecard_setirq(ec, &etherh_ops, eh);
         } else {
                 /*
                  * If we're in the NIC slot, make sure the IRQ is enabled
@@ -759,10 +758,6 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
         return 0;
 
  free:
-        if (eh->ioc_fast)
-                iounmap(eh->ioc_fast);
-        if (eh->memc)
-                iounmap(eh->memc);
         free_netdev(dev);
  release:
         ecard_release_resources(ec);
@@ -773,16 +768,10 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
 static void __devexit etherh_remove(struct expansion_card *ec)
 {
         struct net_device *dev = ecard_get_drvdata(ec);
-        struct etherh_priv *eh = etherh_priv(dev);
 
         ecard_set_drvdata(ec, NULL);
 
         unregister_netdev(dev);
-        ec->ops = NULL;
-
-        if (eh->ioc_fast)
-                iounmap(eh->ioc_fast);
-        iounmap(eh->memc);
 
         free_netdev(dev);