Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

include/asm-x86/io_32.h

+11 −6
Original line number Diff line number Diff line
@@ -199,15 +199,20 @@ 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);

}

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);

}