diff options
author | Christoph Hellwig <hch@lst.de> | 2019-08-17 03:32:31 -0400 |
---|---|---|
committer | Paul Burton <paul.burton@mips.com> | 2019-08-31 12:12:26 -0400 |
commit | 60af0d94cc37287525c396d87e942a52b742743f (patch) | |
tree | c1072606e0be56edcc0d2f888aa586fc737f8827 | |
parent | 42344113ba7a1ed7b5654cd5270af0d5698d8521 (diff) |
mips: remove ioremap_cachable
Just define ioremap_cache directly.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Guo Ren <guoren@kernel.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Vincent Chen <deanbo422@gmail.com>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: linux-mips@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
-rw-r--r-- | arch/mips/include/asm/io.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index d58ff2229738..2b7b56736372 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h | |||
@@ -252,11 +252,11 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset, | |||
252 | #define ioremap_uc ioremap_nocache | 252 | #define ioremap_uc ioremap_nocache |
253 | 253 | ||
254 | /* | 254 | /* |
255 | * ioremap_cachable - map bus memory into CPU space | 255 | * ioremap_cache - map bus memory into CPU space |
256 | * @offset: bus address of the memory | 256 | * @offset: bus address of the memory |
257 | * @size: size of the resource to map | 257 | * @size: size of the resource to map |
258 | * | 258 | * |
259 | * ioremap_nocache performs a platform specific sequence of operations to | 259 | * ioremap_cache performs a platform specific sequence of operations to |
260 | * make bus memory CPU accessible via the readb/readw/readl/writeb/ | 260 | * make bus memory CPU accessible via the readb/readw/readl/writeb/ |
261 | * writew/writel functions and the other mmio helpers. The returned | 261 | * writew/writel functions and the other mmio helpers. The returned |
262 | * address is not guaranteed to be usable directly as a virtual | 262 | * address is not guaranteed to be usable directly as a virtual |
@@ -266,9 +266,8 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset, | |||
266 | * the CPU. Also enables full write-combining. Useful for some | 266 | * the CPU. Also enables full write-combining. Useful for some |
267 | * memory-like regions on I/O busses. | 267 | * memory-like regions on I/O busses. |
268 | */ | 268 | */ |
269 | #define ioremap_cachable(offset, size) \ | 269 | #define ioremap_cache(offset, size) \ |
270 | __ioremap_mode((offset), (size), _page_cachable_default) | 270 | __ioremap_mode((offset), (size), _page_cachable_default) |
271 | #define ioremap_cache ioremap_cachable | ||
272 | 271 | ||
273 | /* | 272 | /* |
274 | * ioremap_wc - map bus memory into CPU space | 273 | * ioremap_wc - map bus memory into CPU space |