Commit 40989d8d authored by Russell King's avatar Russell King

[ARM] Fix some pointer/integer conversion warnings for RiscPC.

Signed-off-by: default avatarRussell King <rmk@arm.linux.org.uk>
parent 9f4da76b
...@@ -124,12 +124,14 @@ static inline unsigned sz __in##fnsuffix (unsigned int port) \ ...@@ -124,12 +124,14 @@ static inline unsigned sz __in##fnsuffix (unsigned int port) \
return (unsigned sz)value; \ return (unsigned sz)value; \
} }
static inline unsigned int __ioaddr (unsigned int port) \ static inline void __iomem *__ioaddr(unsigned int port)
{ \ {
if (__PORT_PCIO(port)) \ void __iomem *ret;
return (unsigned int)(PCIO_BASE + (port << 2)); \ if (__PORT_PCIO(port))
else \ ret = (void __iomem *)PCIO_BASE;
return (unsigned int)(IO_BASE + (port << 2)); \ else
ret = (void __iomem *)IO_BASE;
return ret + (port << 2);
} }
#define DECLARE_IO(sz,fnsuffix,instr) \ #define DECLARE_IO(sz,fnsuffix,instr) \
...@@ -229,7 +231,7 @@ DECLARE_IO(int,l,"") ...@@ -229,7 +231,7 @@ DECLARE_IO(int,l,"")
}) })
#define __ioaddrc(port) \ #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 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))
...@@ -239,7 +241,7 @@ DECLARE_IO(int,l,"") ...@@ -239,7 +241,7 @@ DECLARE_IO(int,l,"")
#define outl(v,p) (__builtin_constant_p((p)) ? __outlc(v,p) : __outl(v,p)) #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)) #define __ioaddr(p) (__builtin_constant_p((p)) ? __ioaddr(p) : __ioaddrc(p))
/* the following macro is deprecated */ /* 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 insb(p,d,l) __raw_readsb(__ioaddr(p),d,l)
#define insw(p,d,l) __raw_readsw(__ioaddr(p),d,l) #define insw(p,d,l) __raw_readsw(__ioaddr(p),d,l)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment