In preparation for having <io.h> be the include file for type confused MMIO accessors and <linux/io.h> for typechecked accessors, let's move out of <io.h> everything that's not directly related to the type confusion. Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> --- v1 -> v2: - unchanged --- include/asm-generic/io.h | 34 ++++++++++++++++++++++++++++++++++ include/io.h | 34 ---------------------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 6383d71746f1..b118979ed1df 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -792,4 +792,38 @@ static inline void memcpy_toio(volatile void __iomem *addr, const void *buffer, #include <asm-generic/bitio.h> +#define IOMEM_ERR_PTR(err) (__force void __iomem *)ERR_PTR(err) + +#ifndef readq_relaxed +#define readq_relaxed(addr) readq(addr) +#endif + +#ifndef readl_relaxed +#define readl_relaxed(addr) readl(addr) +#endif + +#ifndef readw_relaxed +#define readw_relaxed(addr) readw(addr) +#endif + +#ifndef readb_relaxed +#define readb_relaxed(addr) readb(addr) +#endif + +#ifndef writeq_relaxed +#define writeq_relaxed(val, addr) writeq((val), (addr)) +#endif + +#ifndef writel_relaxed +#define writel_relaxed(val, addr) writel((val), (addr)) +#endif + +#ifndef writew_relaxed +#define writew_relaxed(val, addr) writew((val), (addr)) +#endif + +#ifndef writeb_relaxed +#define writeb_relaxed(val, addr) writeb((val), (addr)) +#endif + #endif /* __ASM_GENERIC_IO_H */ diff --git a/include/io.h b/include/io.h index 6a74246ea777..913002072240 100644 --- a/include/io.h +++ b/include/io.h @@ -4,38 +4,4 @@ #include <asm/io.h> -#define IOMEM_ERR_PTR(err) (__force void __iomem *)ERR_PTR(err) - -#ifndef readq_relaxed -#define readq_relaxed(addr) readq(addr) -#endif - -#ifndef readl_relaxed -#define readl_relaxed(addr) readl(addr) -#endif - -#ifndef readw_relaxed -#define readw_relaxed(addr) readw(addr) -#endif - -#ifndef readb_relaxed -#define readb_relaxed(addr) readb(addr) -#endif - -#ifndef writeq_relaxed -#define writeq_relaxed(val, addr) writeq((val), (addr)) -#endif - -#ifndef writel_relaxed -#define writel_relaxed(val, addr) writel((val), (addr)) -#endif - -#ifndef writew_relaxed -#define writew_relaxed(val, addr) writew((val), (addr)) -#endif - -#ifndef writeb_relaxed -#define writeb_relaxed(val, addr) writeb((val), (addr)) -#endif - #endif /* __IO_H */ -- 2.39.2
