aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton2007-10-17 18:04:39 +0200
committerThomas Gleixner2007-10-17 20:16:40 +0200
commit3c215b6680b347593705e010688e80400d772763 (patch)
tree865d529e0d407a7c458a95ba2687cb08d829b891
parent95c1e9aefa5d3a2dd61304797cad96e8fdcd95ce (diff)
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: Uwe Bugla <uwe.bugla@gmx.de> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--include/asm-x86/io_32.h17
1 files changed, 11 insertions, 6 deletions
diff --git a/include/asm-x86/io_32.h b/include/asm-x86/io_32.h
index 4ea7b1ad3c1d..fe881cd1e6f4 100644
--- a/include/asm-x86/io_32.h
+++ b/include/asm-x86/io_32.h
@@ -199,17 +199,22 @@ static inline void writel(unsigned int b, volatile void __iomem *addr)
#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);
}
/*