Browse Source

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>
Dan Williams 9 years ago
parent
commit
06968a5479
1 changed files with 3 additions and 3 deletions
  1. 3 3
      drivers/mtd/maps/pxa2xx-flash.c

+ 3 - 3
drivers/mtd/maps/pxa2xx-flash.c

@@ -71,8 +71,8 @@ static int pxa2xx_flash_probe(struct platform_device *pdev)
 		       info->map.name);
 		       info->map.name);
 		return -ENOMEM;
 		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)
 	if (!info->map.cached)
 		printk(KERN_WARNING "Failed to ioremap cached %s\n",
 		printk(KERN_WARNING "Failed to ioremap cached %s\n",
 		       info->map.name);
 		       info->map.name);
@@ -111,7 +111,7 @@ static int pxa2xx_flash_remove(struct platform_device *dev)
 	map_destroy(info->mtd);
 	map_destroy(info->mtd);
 	iounmap(info->map.virt);
 	iounmap(info->map.virt);
 	if (info->map.cached)
 	if (info->map.cached)
-		iounmap(info->map.cached);
+		memunmap(info->map.cached);
 	kfree(info);
 	kfree(info);
 	return 0;
 	return 0;
 }
 }