From: Christoph Hellwig <hch@lst.de>
Date: Sat, 17 Aug 2019 07:32:41 +0000 (+0200)
Subject: asm-generic: don't provide __ioremap
X-Git-Tag: v5.4-rc1~154^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3940ba8eea8c6c89f547a1bd153977cece5fecd2;p=thirdparty%2Flinux.git

asm-generic: don't provide __ioremap

__ioremap is not a kernel API, but used for helpers with differing
semantics in arch code.  We should not provide it in as-generic.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Paul Walmsley <paul.walmsley@sifive.com>
Tested-by: Paul Walmsley <paul.walmsley@sifive.com> # rv32, rv64 boot
Acked-by: Paul Walmsley <paul.walmsley@sifive.com> # arch/riscv
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index b83e2802c969a..d02806513670c 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -963,15 +963,6 @@ static inline void __iomem *ioremap(phys_addr_t offset, size_t size)
 }
 #endif
 
-#ifndef __ioremap
-#define __ioremap __ioremap
-static inline void __iomem *__ioremap(phys_addr_t offset, size_t size,
-				      unsigned long flags)
-{
-	return ioremap(offset, size);
-}
-#endif
-
 #ifndef iounmap
 #define iounmap iounmap