Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06968a54 authored by Dan Williams's avatar Dan Williams Committed by Brian Norris
Browse files

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: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 192db1ca

drivers/mtd/maps/pxa2xx-flash.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}