X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-rpc%2Fio.h;h=f53c72c2042300897fee319bcf3fea829b5b3d08;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=3f7a2366cad32e0293e2be421d465e19b8afbbf7;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/include/asm-arm/arch-rpc/io.h b/include/asm-arm/arch-rpc/io.h
index 3f7a2366c..f53c72c20 100644
--- a/include/asm-arm/arch-rpc/io.h
+++ b/include/asm-arm/arch-rpc/io.h
@@ -22,40 +22,40 @@
  */
 #define __arch_base_getb(b,o)			\
  ({						\
-	unsigned int v, r = (b);		\
+	unsigned int __v, __r = (b);		\
 	__asm__ __volatile__(			\
 		"ldrb	%0, [%1, %2]"		\
-		: "=r" (v)			\
-		: "r" (r), "Ir" (o));		\
-	v;					\
+		: "=r" (__v)			\
+		: "r" (__r), "Ir" (o));		\
+	__v;					\
  })
 
 #define __arch_base_getl(b,o)			\
  ({						\
-	unsigned int v, r = (b);		\
+	unsigned int __v, __r = (b);		\
 	__asm__ __volatile__(			\
 		"ldr	%0, [%1, %2]"		\
-		: "=r" (v)			\
-		: "r" (r), "Ir" (o));		\
-	v;					\
+		: "=r" (__v)			\
+		: "r" (__r), "Ir" (o));		\
+	__v;					\
  })
 
 #define __arch_base_putb(v,b,o)			\
  ({						\
-	unsigned int r = (b);			\
+	unsigned int __r = (b);			\
 	__asm__ __volatile__(			\
 		"strb	%0, [%1, %2]"		\
 		:				\
-		: "r" (v), "r" (r), "Ir" (o));	\
+		: "r" (v), "r" (__r), "Ir" (o));\
  })
 
 #define __arch_base_putl(v,b,o)			\
  ({						\
-	unsigned int r = (b);			\
+	unsigned int __r = (b);			\
 	__asm__ __volatile__(			\
 		"str	%0, [%1, %2]"		\
 		:				\
-		: "r" (v), "r" (r), "Ir" (o));	\
+		: "r" (v), "r" (__r), "Ir" (o));\
  })
 
 /*
@@ -124,12 +124,14 @@ static inline unsigned sz __in##fnsuffix (unsigned int port)		\
 	return (unsigned sz)value;						\
 }
 
-static inline unsigned int __ioaddr (unsigned int port)			\
-{										\
-	if (__PORT_PCIO(port))							\
-		return (unsigned int)(PCIO_BASE + (port << 2));			\
-	else									\
-		return (unsigned int)(IO_BASE + (port << 2));			\
+static inline void __iomem *__ioaddr(unsigned int port)
+{
+	void __iomem *ret;
+	if (__PORT_PCIO(port))
+		ret = (void __iomem *)PCIO_BASE;
+	else
+		ret = (void __iomem *)IO_BASE;
+	return ret + (port << 2);
 }
 
 #define DECLARE_IO(sz,fnsuffix,instr)	\
@@ -176,15 +178,15 @@ DECLARE_IO(int,l,"")
 
 #define __outwc(value,port)							\
 ({										\
-	unsigned long v = value;						\
+	unsigned long __v = value;						\
 	if (__PORT_PCIO((port)))						\
 		__asm__ __volatile__(						\
 		"str	%0, [%1, %2]	@ outwc"				\
-		: : "r" (v|v<<16), "r" (PCIO_BASE), "Jr" ((port) << 2));	\
+		: : "r" (__v|__v<<16), "r" (PCIO_BASE), "Jr" ((port) << 2));	\
 	else									\
 		__asm__ __volatile__(						\
 		"str	%0, [%1, %2]	@ outwc"				\
-		: : "r" (v|v<<16), "r" (IO_BASE), "r" ((port) << 2));		\
+		: : "r" (__v|__v<<16), "r" (IO_BASE), "r" ((port) << 2));		\
 })
 
 #define __inwc(port)								\
@@ -203,15 +205,15 @@ DECLARE_IO(int,l,"")
 
 #define __outlc(value,port)							\
 ({										\
-	unsigned long v = value;						\
+	unsigned long __v = value;						\
 	if (__PORT_PCIO((port)))						\
 		__asm__ __volatile__(						\
 		"str	%0, [%1, %2]	@ outlc"				\
-		: : "r" (v), "r" (PCIO_BASE), "Jr" ((port) << 2));		\
+		: : "r" (__v), "r" (PCIO_BASE), "Jr" ((port) << 2));		\
 	else									\
 		__asm__ __volatile__(						\
 		"str	%0, [%1, %2]	@ outlc"				\
-		: : "r" (v), "r" (IO_BASE), "r" ((port) << 2));			\
+		: : "r" (__v), "r" (IO_BASE), "r" ((port) << 2));		\
 })
 
 #define __inlc(port)								\
@@ -229,7 +231,7 @@ DECLARE_IO(int,l,"")
 })
 
 #define __ioaddrc(port)								\
-	(__PORT_PCIO((port)) ? PCIO_BASE + ((port) << 2) : IO_BASE + ((port) << 2))
+	((void __iomem *)(__PORT_PCIO((port)) ? PCIO_BASE : IO_BASE) + ((port) << 2))
 
 #define inb(p)	 	(__builtin_constant_p((p)) ? __inbc(p)    : __inb(p))
 #define inw(p)	 	(__builtin_constant_p((p)) ? __inwc(p)    : __inw(p))
@@ -239,7 +241,7 @@ DECLARE_IO(int,l,"")
 #define outl(v,p)	(__builtin_constant_p((p)) ? __outlc(v,p) : __outl(v,p))
 #define __ioaddr(p)	(__builtin_constant_p((p)) ? __ioaddr(p)  : __ioaddrc(p))
 /* the following macro is deprecated */
-#define ioaddr(port)			__ioaddr((port))
+#define ioaddr(port)	((unsigned long)__ioaddr((port)))
 
 #define insb(p,d,l)	__raw_readsb(__ioaddr(p),d,l)
 #define insw(p,d,l)	__raw_readsw(__ioaddr(p),d,l)