[ARM] ecard: add ecardm_iomap() / ecardm_iounmap()

Add devres ecardm_iomap() and ecardm_iounmap() for Acorn expansion
cards.  Convert all expansion card drivers to use them.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 8 insertions, 24 deletions

diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 69c949ea93e3..66f826252aee 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -565,8 +565,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
         ide_hwif_t *hwif;
         void __iomem *base;
 
-        base = ioremap(ecard_resource_start(ec, ECARD_RES_MEMC),
-                       ecard_resource_len(ec, ECARD_RES_MEMC));
+        base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
         if (!base)
                 return -ENOMEM;
 
@@ -583,10 +582,8 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
         icside_irqdisable_arcin_v5(ec, 0);
 
         hwif = icside_setup(base, &icside_cardinfo_v5, ec);
-        if (!hwif) {
-                iounmap(base);
+        if (!hwif)
                 return -ENODEV;
-        }
 
         state->hwif[0] = hwif;
 
@@ -605,8 +602,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         unsigned int sel = 0;
         int ret;
 
-        ioc_base = ioremap(ecard_resource_start(ec, ECARD_RES_IOCFAST),
-                           ecard_resource_len(ec, ECARD_RES_IOCFAST));
+        ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
         if (!ioc_base) {
                 ret = -ENOMEM;
                 goto out;
@@ -615,11 +611,10 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         easi_base = ioc_base;
 
         if (ecard_resource_flags(ec, ECARD_RES_EASI)) {
-                easi_base = ioremap(ecard_resource_start(ec, ECARD_RES_EASI),
-                                    ecard_resource_len(ec, ECARD_RES_EASI));
+                easi_base = ecardm_iomap(ec, ECARD_RES_EASI, 0, 0);
                 if (!easi_base) {
                         ret = -ENOMEM;
-                        goto unmap_slot;
+                        goto out;
                 }
 
                 /*
@@ -648,7 +643,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 
         if (!hwif || !mate) {
                 ret = -ENODEV;
-                goto unmap_port;
+                goto out;
         }
 
         state->hwif[0]    = hwif;
@@ -685,11 +680,6 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 
         return 0;
 
- unmap_port:
-        if (easi_base != ioc_base)
-                iounmap(easi_base);
- unmap_slot:
-        iounmap(ioc_base);
  out:
         return ret;
 }
@@ -715,8 +705,7 @@ icside_probe(struct expansion_card *ec, const struct ecard_id *id)
         state->type     = ICS_TYPE_NOTYPE;
         state->dev      = &ec->dev;
 
-        idmem = ioremap(ecard_resource_start(ec, ECARD_RES_IOCFAST),
-                        ecard_resource_len(ec, ECARD_RES_IOCFAST));
+        idmem = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
         if (idmem) {
                 unsigned int type;
 
@@ -724,7 +713,7 @@ icside_probe(struct expansion_card *ec, const struct ecard_id *id)
                 type |= (readb(idmem + ICS_IDENT_OFFSET + 4) & 1) << 1;
                 type |= (readb(idmem + ICS_IDENT_OFFSET + 8) & 1) << 2;
                 type |= (readb(idmem + ICS_IDENT_OFFSET + 12) & 1) << 3;
-                iounmap(idmem);
+                ecardm_iounmap(ec, idmem);
 
                 state->type = type;
         }
@@ -793,11 +782,6 @@ static void __devexit icside_remove(struct expansion_card *ec)
 
         ecard_set_drvdata(ec, NULL);
 
-        if (state->ioc_base)
-                iounmap(state->ioc_base);
-        if (state->ioc_base != state->irq_port)
-                iounmap(state->irq_port);
-
         kfree(state);
         ecard_release_resources(ec);
 }