diff options
| author | Greg Ungerer <gerg@linux-m68k.org> | 2018-03-21 23:36:11 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@linux-m68k.org> | 2018-05-28 09:45:25 +1000 |
| commit | fedc33e36406c4e50592a286169583d0d3d25a2e (patch) | |
| tree | 24088b141527376864d57c0c97ffde9ccb9dfa07 /arch/m68k/include | |
| parent | b04e217704b7f879c6b91222b066983a44a7a09f (diff) | |
m68k: move *_relaxed macros into io_no.h and io_mm.h
Move a copy of the definitions of the *_relaxed() macros into io_no.h
and io_mm.h. This precedes a change to the io_no.h file to use
asm-generic/io.h. They will be removed from io_no.h at that point.
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Angelo Dureghello <angelo@sysam.it>
Tested-by: Angelo Dureghello <angelo@sysam.it>
Diffstat (limited to 'arch/m68k/include')
| -rw-r--r-- | arch/m68k/include/asm/io.h | 8 | ||||
| -rw-r--r-- | arch/m68k/include/asm/io_mm.h | 8 | ||||
| -rw-r--r-- | arch/m68k/include/asm/io_no.h | 8 |
3 files changed, 16 insertions, 8 deletions
diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h index 756089cc019c..00b45155969c 100644 --- a/arch/m68k/include/asm/io.h +++ b/arch/m68k/include/asm/io.h @@ -4,11 +4,3 @@ #else #include <asm/io_mm.h> #endif - -#define readb_relaxed(addr) readb(addr) -#define readw_relaxed(addr) readw(addr) -#define readl_relaxed(addr) readl(addr) - -#define writeb_relaxed(b, addr) writeb(b, addr) -#define writew_relaxed(b, addr) writew(b, addr) -#define writel_relaxed(b, addr) writel(b, addr) diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h index ed5333e87879..22e778e293c6 100644 --- a/arch/m68k/include/asm/io_mm.h +++ b/arch/m68k/include/asm/io_mm.h @@ -524,4 +524,12 @@ static inline void ioport_unmap(void __iomem *p) { } +#define readb_relaxed(addr) readb(addr) +#define readw_relaxed(addr) readw(addr) +#define readl_relaxed(addr) readl(addr) + +#define writeb_relaxed(b, addr) writeb(b, addr) +#define writew_relaxed(b, addr) writew(b, addr) +#define writel_relaxed(b, addr) writel(b, addr) + #endif /* _IO_H */ diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h index 86f45b403bcc..ffe567e79082 100644 --- a/arch/m68k/include/asm/io_no.h +++ b/arch/m68k/include/asm/io_no.h @@ -189,4 +189,12 @@ static inline void ioport_unmap(void __iomem *p) #endif /* __KERNEL__ */ +#define readb_relaxed(addr) readb(addr) +#define readw_relaxed(addr) readw(addr) +#define readl_relaxed(addr) readl(addr) + +#define writeb_relaxed(b, addr) writeb(b, addr) +#define writew_relaxed(b, addr) writew(b, addr) +#define writel_relaxed(b, addr) writel(b, addr) + #endif /* _M68KNOMMU_IO_H */ |