mtd: pxa2xx-flash: switch from ioremap_cache to memremap

In preparation for deprecating ioremap_cache() convert its usage in
pxa2xx-flash to memremap.

Cc: David Woodhouse <[email protected]>
[brian: also convert iounmap to memunmap]
Signed-off-by: Dan Williams <[email protected]>
Signed-off-by: Brian Norris <[email protected]>

diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 12fa75df50084dea86a41d991dee96e5ebd14096..5ff6cc5b48442423fa3688a03dd765614d95247e 100644 (file)
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -71,8 +71,8 @@ static int pxa2xx_flash_probe(struct platform_device *pdev)
                       info->map.name);
                return -ENOMEM;
        }
-       info->map.cached =
-               ioremap_cache(info->map.phys, info->map.size);
+       info->map.cached = memremap(info->map.phys, info->map.size,
+                       MEMREMAP_WB);
        if (!info->map.cached)
                printk(KERN_WARNING "Failed to ioremap cached %s\n",
                       info->map.name);
@@ -111,7 +111,7 @@ static int pxa2xx_flash_remove(struct platform_device *dev)
        map_destroy(info->mtd);
        iounmap(info->map.virt);
        if (info->map.cached)
-               iounmap(info->map.cached);
+               memunmap(info->map.cached);
        kfree(info);
        return 0;
 }