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: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Will Deacon 2019-02-22 17:25:29 +00:00
Родитель 96670b2fd0
Коммит 01e3b958ef
6 изменённых файлов: 0 добавлений и 14 удалений

Просмотреть файл

@ -513,8 +513,6 @@ extern inline void writeq(u64 b, volatile void __iomem *addr)
#define writel_relaxed(b, addr) __raw_writel(b, addr) #define writel_relaxed(b, addr) __raw_writel(b, addr)
#define writeq_relaxed(b, addr) __raw_writeq(b, addr) #define writeq_relaxed(b, addr) __raw_writeq(b, addr)
#define mmiowb()
/* /*
* String version of IO memory access ops: * String version of IO memory access ops:
*/ */

Просмотреть файл

@ -184,8 +184,6 @@ static inline void writel(u32 data, volatile void __iomem *addr)
#define writew_relaxed __raw_writew #define writew_relaxed __raw_writew
#define writel_relaxed __raw_writel #define writel_relaxed __raw_writel
#define mmiowb()
/* /*
* Need an mtype somewhere in here, for cache type deals? * Need an mtype somewhere in here, for cache type deals?
* This is probably too long for an inline. * This is probably too long for an inline.

Просмотреть файл

@ -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 writel_relaxed(l, addr) writel(l, addr)
#define writeq_relaxed(q, addr) writeq(q, 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 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_fromio(void *dst, const volatile void __iomem *src, int count);
void memcpy_toio(volatile void __iomem *dst, const void *src, int count); void memcpy_toio(volatile void __iomem *dst, const void *src, int count);

Просмотреть файл

@ -11,8 +11,6 @@
#define arch_mmiowb_state() (&local_paca->mmiowb_state) #define arch_mmiowb_state() (&local_paca->mmiowb_state)
#define mmiowb() mb() #define mmiowb() mb()
#else
#define mmiowb() do { } while (0)
#endif /* CONFIG_MMIOWB */ #endif /* CONFIG_MMIOWB */
#include <asm-generic/mmiowb.h> #include <asm-generic/mmiowb.h>

Просмотреть файл

@ -396,8 +396,6 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src,
} }
} }
#define mmiowb()
#ifdef __KERNEL__ #ifdef __KERNEL__
/* On sparc64 we have the whole physical IO address space accessible /* On sparc64 we have the whole physical IO address space accessible

Просмотреть файл

@ -22,10 +22,6 @@
#include <asm/mmiowb.h> #include <asm/mmiowb.h>
#include <asm-generic/pci_iomap.h> #include <asm-generic/pci_iomap.h>
#ifndef mmiowb
#define mmiowb() do {} while (0)
#endif
#ifndef __io_br #ifndef __io_br
#define __io_br() barrier() #define __io_br() barrier()
#endif #endif