aboutsummaryrefslogtreecommitdiff
path: root/arch/xtensa/include/asm/io.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-10-16 08:09:38 +0200
committerChristoph Hellwig <hch@lst.de>2019-11-11 21:18:19 +0100
commitd092a87073269677b7ff09e71a8d91912b7f969a (patch)
treee86ed34b3710397845f249bf12ff9ef88463df20 /arch/xtensa/include/asm/io.h
parent97c9801a15e5b0c9a20e495b2ccabf010894e74b (diff)
downloadlinux-d092a87073269677b7ff09e71a8d91912b7f969a.tar.gz
arch: rely on asm-generic/io.h for default ioremap_* definitions
Various architectures that use asm-generic/io.h still defined their own default versions of ioremap_nocache, ioremap_wt and ioremap_wc that point back to plain ioremap directly or indirectly. Remove these definitions and rely on asm-generic/io.h instead. For this to work the backup ioremap_* defintions needs to be changed to purely cpp macros instea of inlines to cover for architectures like openrisc that only define ioremap after including <asm-generic/io.h>. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Palmer Dabbelt <palmer@dabbelt.com>
Diffstat (limited to 'arch/xtensa/include/asm/io.h')
-rw-r--r--arch/xtensa/include/asm/io.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h
index 441fb56926a7..54188e69b988 100644
--- a/arch/xtensa/include/asm/io.h
+++ b/arch/xtensa/include/asm/io.h
@@ -52,10 +52,6 @@ static inline void __iomem *ioremap_cache(unsigned long offset,
}
#define ioremap_cache ioremap_cache
-#define ioremap_nocache ioremap
-#define ioremap_wc ioremap
-#define ioremap_wt ioremap
-
static inline void iounmap(volatile void __iomem *addr)
{
unsigned long va = (unsigned long) addr;