[ARM] omap: convert OMAP drivers to use ioremap()

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

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index c16028872bbb..1e50bf56c2ce 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1455,7 +1455,9 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
 
         host->irq = irq;
         host->phys_base = host->mem_res->start;
-        host->virt_base = (void __iomem *) IO_ADDRESS(host->phys_base);
+        host->virt_base = ioremap(res->start, res->end - res->start + 1);
+        if (!host->virt_base)
+                goto err_ioremap;
 
         if (cpu_is_omap24xx()) {
                 host->iclk = clk_get(&pdev->dev, "mmc_ick");
@@ -1510,6 +1512,8 @@ err_free_iclk:
                 clk_put(host->iclk);
         }
 err_free_mmc_host:
+        iounmap(host->virt_base);
+err_ioremap:
         kfree(host);
 err_free_mem_region:
         release_mem_region(res->start, res->end - res->start + 1);
@@ -1536,6 +1540,7 @@ static int mmc_omap_remove(struct platform_device *pdev)
         if (host->fclk && !IS_ERR(host->fclk))
                 clk_put(host->fclk);
 
+        iounmap(host->virt_base);
         release_mem_region(pdev->resource[0].start,
                            pdev->resource[0].end - pdev->resource[0].start + 1);