summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-08-17 09:32:35 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2019-09-02 09:50:26 +0200
commit2cecd1f11ca4a7d402bee4bb12198e5283a4fb81 (patch)
tree79e2c552bc45d4aa2d47b531d1e8c91c2dfc7be9 /arch/m68k
parentm68k: defconfig: Update defconfigs for v5.3-rc2 (diff)
downloadlinux-2cecd1f11ca4a7d402bee4bb12198e5283a4fb81.tar.xz
linux-2cecd1f11ca4a7d402bee4bb12198e5283a4fb81.zip
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 <hch@lst.de> Link: https://lore.kernel.org/r/20190817073253.27819-9-hch@lst.de Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/kmap.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/m68k/include/asm/kmap.h b/arch/m68k/include/asm/kmap.h
index aac7f045f7f0..6354380a4b4e 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)