Commit 8de35efb authored by Russell King's avatar Russell King Committed by Russell King

[ARM] ebsa110: fix warnings generated by asm/arch/io.h

Remove two warnings:
drivers/serial/8250_early.c:136: warning: unused variable 'mapsize'
include/linux/io.h:47: warning: passing argument 1 of '__readb' discards qualifiers from pointer target type
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent eb370f0b
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/page.h> #include <asm/page.h>
static void __iomem *__isamem_convert_addr(void __iomem *addr) static void __iomem *__isamem_convert_addr(const volatile void __iomem *addr)
{ {
u32 ret, a = (u32 __force) addr; u32 ret, a = (u32 __force) addr;
...@@ -63,7 +63,7 @@ static void __iomem *__isamem_convert_addr(void __iomem *addr) ...@@ -63,7 +63,7 @@ static void __iomem *__isamem_convert_addr(void __iomem *addr)
/* /*
* read[bwl] and write[bwl] * read[bwl] and write[bwl]
*/ */
u8 __readb(void __iomem *addr) u8 __readb(const volatile void __iomem *addr)
{ {
void __iomem *a = __isamem_convert_addr(addr); void __iomem *a = __isamem_convert_addr(addr);
u32 ret; u32 ret;
...@@ -75,7 +75,7 @@ u8 __readb(void __iomem *addr) ...@@ -75,7 +75,7 @@ u8 __readb(void __iomem *addr)
return ret; return ret;
} }
u16 __readw(void __iomem *addr) u16 __readw(const volatile void __iomem *addr)
{ {
void __iomem *a = __isamem_convert_addr(addr); void __iomem *a = __isamem_convert_addr(addr);
...@@ -85,7 +85,7 @@ u16 __readw(void __iomem *addr) ...@@ -85,7 +85,7 @@ u16 __readw(void __iomem *addr)
return __raw_readw(a); return __raw_readw(a);
} }
u32 __readl(void __iomem *addr) u32 __readl(const volatile void __iomem *addr)
{ {
void __iomem *a = __isamem_convert_addr(addr); void __iomem *a = __isamem_convert_addr(addr);
u32 ret; u32 ret;
......
...@@ -27,9 +27,9 @@ void __outw(u16 val, unsigned int port); ...@@ -27,9 +27,9 @@ void __outw(u16 val, unsigned int port);
u32 __inl(unsigned int port); u32 __inl(unsigned int port);
void __outl(u32 val, unsigned int port); void __outl(u32 val, unsigned int port);
u8 __readb(void __iomem *addr); u8 __readb(const volatile void __iomem *addr);
u16 __readw(void __iomem *addr); u16 __readw(const volatile void __iomem *addr);
u32 __readl(void __iomem *addr); u32 __readl(const volatile void __iomem *addr);
void __writeb(u8 val, void __iomem *addr); void __writeb(u8 val, void __iomem *addr);
void __writew(u16 val, void __iomem *addr); void __writew(u16 val, void __iomem *addr);
...@@ -64,7 +64,13 @@ void __writel(u32 val, void __iomem *addr); ...@@ -64,7 +64,13 @@ void __writel(u32 val, void __iomem *addr);
#define writew(v,b) __writew(v,b) #define writew(v,b) __writew(v,b)
#define writel(v,b) __writel(v,b) #define writel(v,b) __writel(v,b)
#define __arch_ioremap(cookie,sz,c) ((void __iomem *)(cookie)) static inline void __iomem *__arch_ioremap(unsigned long cookie, size_t size,
unsigned int flags)
{
return (void __iomem *)cookie;
}
#define __arch_ioremap __arch_ioremap
#define __arch_iounmap(cookie) do { } while (0) #define __arch_iounmap(cookie) do { } while (0)
extern void insb(unsigned int port, void *buf, int sz); extern void insb(unsigned int port, void *buf, int sz);
......
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