aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2015-10-09 18:16:51 -0400
committerBrian Norris <computersforpeace@gmail.com>2015-10-12 13:58:33 -0400
commit06968a54790d9dd87a5bb68e8197b5094eff63c3 (patch)
tree5f2aa915121fad83942ffb7bdf09a05b569a128b /drivers/mtd/maps
parent192db1caa253c087496b9671ab8aa0a53da31f35 (diff)
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@infradead.org> [brian: also convert iounmap to memunmap] Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/maps')
-rw-r--r--drivers/mtd/maps/pxa2xx-flash.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 12fa75df5008..5ff6cc5b4844 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)
71 info->map.name); 71 info->map.name);
72 return -ENOMEM; 72 return -ENOMEM;
73 } 73 }
74 info->map.cached = 74 info->map.cached = memremap(info->map.phys, info->map.size,
75 ioremap_cache(info->map.phys, info->map.size); 75 MEMREMAP_WB);
76 if (!info->map.cached) 76 if (!info->map.cached)
77 printk(KERN_WARNING "Failed to ioremap cached %s\n", 77 printk(KERN_WARNING "Failed to ioremap cached %s\n",
78 info->map.name); 78 info->map.name);
@@ -111,7 +111,7 @@ static int pxa2xx_flash_remove(struct platform_device *dev)
111 map_destroy(info->mtd); 111 map_destroy(info->mtd);
112 iounmap(info->map.virt); 112 iounmap(info->map.virt);
113 if (info->map.cached) 113 if (info->map.cached)
114 iounmap(info->map.cached); 114 memunmap(info->map.cached);
115 kfree(info); 115 kfree(info);
116 return 0; 116 return 0;
117} 117}