Commit 3c215b66 authored by Andrew Morton's avatar Andrew Morton Committed by Thomas Gleixner

x86: asm-i386/io.h fix constness

- Fix this:

include/asm/io.h: In function `memcpy_fromio':
include/asm/io.h:208: warning: passing argument 2 of `__memcpy' discards qualifiers from pointer target type

- Clean up code a bit
Reported-by: default avatarUwe Bugla <uwe.bugla@gmx.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 95c1e9ae
...@@ -199,17 +199,22 @@ static inline void writel(unsigned int b, volatile void __iomem *addr) ...@@ -199,17 +199,22 @@ static inline void writel(unsigned int b, volatile void __iomem *addr)
#define mmiowb() #define mmiowb()
static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count) static inline void
memset_io(volatile void __iomem *addr, unsigned char val, int count)
{ {
memset((void __force *) addr, val, count); memset((void __force *)addr, val, count);
} }
static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, int count)
static inline void
memcpy_fromio(void *dst, const volatile void __iomem *src, int count)
{ {
__memcpy(dst, (void __force *) src, count); __memcpy(dst, (const void __force *)src, count);
} }
static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int count)
static inline void
memcpy_toio(volatile void __iomem *dst, const void *src, int count)
{ {
__memcpy((void __force *) dst, src, count); __memcpy((void __force *)dst, src, count);
} }
/* /*
......
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