Commit 01e3b958 authored by Will Deacon's avatar Will Deacon
Browse files

arch: Remove dummy mmiowb() definitions from arch code 



Now that no driver code is using mmiowb() directly, remove the dummy
definitions remaining in architectures that don't make use of
asm-generic/io.h, as well as the definition in asm-generic/io.h itself.

Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 96670b2f

arch/alpha/include/asm/io.h

+0 −2
Original line number Diff line number Diff line
@@ -513,8 +513,6 @@ extern inline void writeq(u64 b, volatile void __iomem *addr) 
#define writel_relaxed(b, addr)	__raw_writel(b, addr)

#define writeq_relaxed(b, addr)	__raw_writeq(b, addr)



#define mmiowb()



/*

 * String version of IO memory access ops:

 */

arch/hexagon/include/asm/io.h

+0 −2
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ static inline void writel(u32 data, volatile void __iomem *addr) 
#define writew_relaxed __raw_writew

#define writel_relaxed __raw_writel



#define mmiowb()



/*

 * Need an mtype somewhere in here, for cache type deals?

 * This is probably too long for an inline.

arch/parisc/include/asm/io.h

+0 −2
Original line number Diff line number Diff line
@@ -229,8 +229,6 @@ static inline void writeq(unsigned long long q, volatile void __iomem *addr) 
#define writel_relaxed(l, addr)	writel(l, addr)

#define writeq_relaxed(q, addr)	writeq(q, addr)



#define mmiowb() do { } while (0)



void memset_io(volatile void __iomem *addr, unsigned char val, int count);

void memcpy_fromio(void *dst, const volatile void __iomem *src, int count);

void memcpy_toio(volatile void __iomem *dst, const void *src, int count);

arch/powerpc/include/asm/mmiowb.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
#define arch_mmiowb_state()	(&local_paca->mmiowb_state)

#define mmiowb()		mb()



#else

#define mmiowb()		do { } while (0)

#endif /* CONFIG_MMIOWB */



#include <asm-generic/mmiowb.h>

arch/sparc/include/asm/io_64.h

+0 −2
Original line number Diff line number Diff line
@@ -396,8 +396,6 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, 
	}

}



#define mmiowb()



#ifdef __KERNEL__



/* On sparc64 we have the whole physical IO address space accessible

CRA Git | Maintained and supported by SUSTech CRA and CCSE