diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2015-10-09 18:16:51 -0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-10-12 10:58:33 -0700 |
| commit | 06968a54790d9dd87a5bb68e8197b5094eff63c3 (patch) | |
| tree | 5f2aa915121fad83942ffb7bdf09a05b569a128b /drivers/mtd/maps | |
| parent | 192db1caa253c087496b9671ab8aa0a53da31f35 (diff) | |
| download | linux-06968a54790d9dd87a5bb68e8197b5094eff63c3.tar.bz2 | |
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.c | 6 |
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) 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; } |