Commit fedc33e3 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@linux-m68k.org>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarAngelo Dureghello <angelo@sysam.it>
Tested-by: default avatarAngelo Dureghello <angelo@sysam.it>
parent b04e2177

arch/m68k/include/asm/io.h

+0 −8
Original line number Diff line number Diff line
@@ -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)

arch/m68k/include/asm/io_mm.h

+8 −0
Original line number Diff line number Diff line
@@ -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 */

arch/m68k/include/asm/io_no.h

+8 −0
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE