mtd: pxa2xx-flash: switch from ioremap_cache to memremap

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=06968a54790d9dd87a5bb68e8197b5094eff63c3
Commit:     06968a54790d9dd87a5bb68e8197b5094eff63c3
Parent:     192db1caa253c087496b9671ab8aa0a53da31f35
Author:     Dan Williams <dan.j.williams at intel.com>
AuthorDate: Fri Oct 9 18:16:51 2015 -0400
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Mon Oct 12 10:58:33 2015 -0700

    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 <dwmw2 at infradead.org>
    [brian: also convert iounmap to memunmap]
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/maps/pxa2xx-flash.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 12fa75d..5ff6cc5 100644
--- 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;
 }