ARM: remove compile time __arch_ioremap/__arch_iounmap

Now that all custom ioremap/iounmap users are converted to runtime hook,
remove the compile time defines.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: Nicolas Pitre <nico@linaro.org>

1 files changed, 5 insertions, 10 deletions

diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 6c363c16851..6f7555ddab8 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -269,16 +269,11 @@ extern void _memset_io(volatile void __iomem *, int, size_t);
  * Documentation/io-mapping.txt.
  *
  */
-#ifndef __arch_ioremap
-#define __arch_ioremap                  __arm_ioremap
-#define __arch_iounmap                  __arm_iounmap
-#endif
-
-#define ioremap(cookie,size)            __arch_ioremap((cookie), (size), MT_DEVICE)
-#define ioremap_nocache(cookie,size)    __arch_ioremap((cookie), (size), MT_DEVICE)
-#define ioremap_cached(cookie,size)     __arch_ioremap((cookie), (size), MT_DEVICE_CACHED)
-#define ioremap_wc(cookie,size)         __arch_ioremap((cookie), (size), MT_DEVICE_WC)
-#define iounmap                         __arch_iounmap
+#define ioremap(cookie,size)            __arm_ioremap((cookie), (size), MT_DEVICE)
+#define ioremap_nocache(cookie,size)    __arm_ioremap((cookie), (size), MT_DEVICE)
+#define ioremap_cached(cookie,size)     __arm_ioremap((cookie), (size), MT_DEVICE_CACHED)
+#define ioremap_wc(cookie,size)         __arm_ioremap((cookie), (size), MT_DEVICE_WC)
+#define iounmap                         __arm_iounmap
 
 /*
  * io{read,write}{8,16,32} macros