Messages in this thread Patch in this message | | | From | Arnd Bergmann <> | Subject | [PATCH] iomem: remove __weak ioremap_cache helper | Date | Wed, 26 Jul 2023 16:54:09 +0200 |
| |
From: Arnd Bergmann <arnd@arndb.de>
No portable code calls into this function any more, and on architectures that don't use or define their own, it causes a warning:
kernel/iomem.c:10:22: warning: no previous prototype for 'ioremap_cache' [-Wmissing-prototypes] 10 | __weak void __iomem *ioremap_cache(resource_size_t offset, unsigned long size)
Fold it into the only caller that uses it on architectures without the #define.
Note that the fallback to ioremap is probably still wrong on those architectures, but this is what it's always done there.
Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- kernel/iomem.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/kernel/iomem.c b/kernel/iomem.c index 9682471e64717..dc2120776e1c3 100644 --- a/kernel/iomem.c +++ b/kernel/iomem.c @@ -5,18 +5,14 @@ #include <linux/mm.h> #include <linux/ioremap.h> -#ifndef ioremap_cache -/* temporary while we convert existing ioremap_cache users to memremap */ -__weak void __iomem *ioremap_cache(resource_size_t offset, unsigned long size) -{ - return ioremap(offset, size); -} -#endif - #ifndef arch_memremap_wb static void *arch_memremap_wb(resource_size_t offset, unsigned long size) { +#ifdef ioremap_cache return (__force void *)ioremap_cache(offset, size); +#else + return (__force void *)ioremap(offset, size); +#endif } #endif -- 2.39.2
| |