diff options
author | Anton Blanchard <anton@samba.org> | 2011-05-08 17:43:47 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 00:30:43 -0400 |
commit | 40f1ce7fb7e8b5d4d0821c0f3dc866cb1d47d99c (patch) | |
tree | 5a0f977967bb6353753b034bfb32ab11c8226d30 /arch/powerpc/sysdev/fsl_85xx_cache_sram.c | |
parent | be135f40899cb3334faa7d2e27025055da311ec4 (diff) |
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>
Diffstat (limited to 'arch/powerpc/sysdev/fsl_85xx_cache_sram.c')
-rw-r--r-- | arch/powerpc/sysdev/fsl_85xx_cache_sram.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, | |||
106 | goto out_free; | 106 | goto out_free; |
107 | } | 107 | } |
108 | 108 | ||
109 | cache_sram->base_virt = ioremap_flags(cache_sram->base_phys, | 109 | cache_sram->base_virt = ioremap_prot(cache_sram->base_phys, |
110 | cache_sram->size, _PAGE_COHERENT | PAGE_KERNEL); | 110 | cache_sram->size, _PAGE_COHERENT | PAGE_KERNEL); |
111 | if (!cache_sram->base_virt) { | 111 | if (!cache_sram->base_virt) { |
112 | dev_err(&dev->dev, "%s: ioremap_flags failed\n", | 112 | dev_err(&dev->dev, "%s: ioremap_prot failed\n", |
113 | dev->dev.of_node->full_name); | 113 | dev->dev.of_node->full_name); |
114 | ret = -ENOMEM; | 114 | ret = -ENOMEM; |
115 | goto out_release; | 115 | goto out_release; |