Skip to content

Commit

Permalink
mtd: pxa2xx-flash: switch from ioremap_cache to memremap
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Williams authored and Brian Norris committed Oct 12, 2015
1 parent 192db1c commit 06968a5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/mtd/maps/pxa2xx-flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 06968a5

Please sign in to comment.