powerpc: Remove ioremap_flags

We have a confusing number of ioremap functions. Make things just a
bit simpler by merging ioremap_flags and ioremap_prot.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 1636dd896707..bd0d54060b94 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -216,7 +216,7 @@ static int axon_ram_probe(struct platform_device *device)
                         AXON_RAM_DEVICE_NAME, axon_ram_bank_id, bank->size >> 20);
 
         bank->ph_addr = resource.start;
-        bank->io_addr = (unsigned long) ioremap_flags(
+        bank->io_addr = (unsigned long) ioremap_prot(
                         bank->ph_addr, bank->size, _PAGE_NO_CACHE);
         if (bank->io_addr == 0) {
                 dev_err(&device->dev, "ioremap() failed\n");
diff --git a/arch/powerpc/sysdev/fsl_85xx_cache_sram.c b/arch/powerpc/sysdev/fsl_85xx_cache_sram.c
index 54fb1922fe30..116415899176 100644
--- a/arch/powerpc/sysdev/fsl_85xx_cache_sram.c
+++ b/arch/powerpc/sysdev/fsl_85xx_cache_sram.c
@@ -106,10 +106,10 @@ int __init instantiate_cache_sram(struct platform_device *dev,
                 goto out_free;
         }
 
-        cache_sram->base_virt = ioremap_flags(cache_sram->base_phys,
+        cache_sram->base_virt = ioremap_prot(cache_sram->base_phys,
                                 cache_sram->size, _PAGE_COHERENT | PAGE_KERNEL);
         if (!cache_sram->base_virt) {
-                dev_err(&dev->dev, "%s: ioremap_flags failed\n",
+                dev_err(&dev->dev, "%s: ioremap_prot failed\n",
                                 dev->dev.of_node->full_name);
                 ret = -ENOMEM;
                 goto out_release;