Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / ide / arm / rapide.c

diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index 9c6c49fdd2b14997d51d441b3ca9399cfd1d1f08..83811af11610d91a371825ca5e937af6ec327927 100644 (file)
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -63,8 +63,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
        if (ret)
                goto out;
 
-       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) {
                ret = -ENOMEM;
                goto release;
@@ -76,12 +75,11 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
                hwif->gendev.parent = &ec->dev;
                hwif->noprobe = 0;
                probe_hwif_init(hwif);
-               create_proc_ide_interfaces();
+               ide_proc_register_port(hwif);
                ecard_set_drvdata(ec, hwif);
                goto out;
        }
 
-       iounmap(base);
  release:
        ecard_release_resources(ec);
  out:
@@ -96,7 +94,6 @@ static void __devexit rapide_remove(struct expansion_card *ec)
 
        /* there must be a better way */
        ide_unregister(hwif - ide_hwifs);
-       iounmap(hwif->hwif_data);
        ecard_release_resources(ec);
 }