From: Christoph Hellwig Date: Sat, 17 Aug 2019 07:32:35 +0000 (+0200) Subject: m68k: Simplify ioremap_nocache() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2cecd1f11ca4a7d402bee4bb12198e5283a4fb81;p=linux.git m68k: Simplify ioremap_nocache() Just define ioremap_nocache to ioremap instead of duplicating the inline. Also define ioremap_uc in terms of ioremap instead of using a double indirection. Signed-off-by: Christoph Hellwig Link: https://lore.kernel.org/r/20190817073253.27819-9-hch@lst.de Signed-off-by: Geert Uytterhoeven --- diff --git a/arch/m68k/include/asm/kmap.h b/arch/m68k/include/asm/kmap.h index aac7f045f7f0a..6354380a4b4e3 100644 --- a/arch/m68k/include/asm/kmap.h +++ b/arch/m68k/include/asm/kmap.h @@ -28,14 +28,8 @@ static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size) return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); } -#define ioremap_nocache ioremap_nocache -static inline void __iomem *ioremap_nocache(unsigned long physaddr, - unsigned long size) -{ - return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); -} - -#define ioremap_uc ioremap_nocache +#define ioremap_nocache ioremap +#define ioremap_uc ioremap #define ioremap_wt ioremap_wt static inline void __iomem *ioremap_wt(unsigned long physaddr, unsigned long size)