[ARM] rpc: deprecate __ioaddr() and __ioaddrc() helpers
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 19 Apr 2008 14:56:08 +0000 (15:56 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Jul 2008 13:25:58 +0000 (14:25 +0100)
Now everything is converted to use MMIO accessors, these helpers
are no longer required.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
include/asm-arm/arch-rpc/io.h

index b4da08d..6bd2295 100644 (file)
@@ -126,7 +126,7 @@ static inline unsigned sz __in##fnsuffix (unsigned int port)                \
        return (unsigned sz)value;                                              \
 }
 
-static inline void __iomem *__ioaddr(unsigned int port)
+static inline void __iomem *__deprecated __ioaddr(unsigned int port)
 {
        void __iomem *ret;
        if (__PORT_PCIO(port))
@@ -232,8 +232,7 @@ DECLARE_IO(int,l,"")
        result;                                                                 \
 })
 
-#define __ioaddrc(port)                \
-       ((__PORT_PCIO(port) ? PCIO_BASE : IO_BASE) + ((port) << 2))
+#define __ioaddrc(port)                __ioaddr(port)
 
 #define inb(p)         (__builtin_constant_p((p)) ? __inbc(p)    : __inb(p))
 #define inw(p)         (__builtin_constant_p((p)) ? __inwc(p)    : __inw(p))