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 <[email protected]>
Cc: Russell King <[email protected]>
Acked-by: Nicolas Pitre <[email protected]>

diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 6c363c16851c71aa1434b4ae8f88f70e07fa2f48..6f7555ddab8cd0a979647f0a6ee999a18f9da0cf 100644 (file)
--- 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