瀏覽代碼

[ARM] rpc: deprecate __ioaddr() and __ioaddrc() helpers

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>
Russell King 17 年之前
父節點
當前提交
50bbb05d60
共有 1 個文件被更改,包括 2 次插入3 次删除
  1. 2 3
      include/asm-arm/arch-rpc/io.h

+ 2 - 3
include/asm-arm/arch-rpc/io.h

@@ -126,7 +126,7 @@ static inline unsigned sz __in##fnsuffix (unsigned int port)		\
 	return (unsigned sz)value;						\
 	return (unsigned sz)value;						\
 }
 }
 
 
-static inline void __iomem *__ioaddr(unsigned int port)
+static inline void __iomem *__deprecated __ioaddr(unsigned int port)
 {
 {
 	void __iomem *ret;
 	void __iomem *ret;
 	if (__PORT_PCIO(port))
 	if (__PORT_PCIO(port))
@@ -232,8 +232,7 @@ DECLARE_IO(int,l,"")
 	result;									\
 	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 inb(p)	 	(__builtin_constant_p((p)) ? __inbc(p)    : __inb(p))
 #define inw(p)	 	(__builtin_constant_p((p)) ? __inwc(p)    : __inw(p))
 #define inw(p)	 	(__builtin_constant_p((p)) ? __inwc(p)    : __inw(p))