[PATCH] sh: make !MMU iounmap an inline function

From: Vincent Whitchurch
Date: Thu Apr 14 2022 - 04:13:10 EST


The current definition of sh's !MMU iounmap makes it unusable in certain
kinds of code, such as this instance caught by 0day on a patch posted to
the mailing lists:

In file included from include/linux/io.h:13,
from drivers/mtd/devices/phram.c:21:
drivers/mtd/devices/phram.c: In function 'register_device':
arch/sh/include/asm/io.h:274:33: error: expected expression before 'do'
274 | #define iounmap(addr) do { } while (0)
| ^~
drivers/mtd/devices/phram.c:150:44: note: in expansion of macro 'iounmap'
150 | cached ? memunmap(new->mtd.priv) : iounmap(new->mtd.priv);
| ^~~~~~~

Make it an inline function as it was earlier.

Link: https://lore.kernel.org/lkml/202204131446.omJ5mC54-lkp@xxxxxxxxx/
Fixes: 13f1fc870dd747131 ("sh: move the ioremap implementation out of line")
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Signed-off-by: Vincent Whitchurch <vincent.whitchurch@xxxxxxxx>
---
arch/sh/include/asm/io.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index cf9a3ec32406..6bb978cf2ece 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -271,7 +271,7 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset, unsigned long size,
#endif /* CONFIG_HAVE_IOREMAP_PROT */

#else /* CONFIG_MMU */
-#define iounmap(addr) do { } while (0)
+static inline void iounmap(void __iomem *addr) {};
#define ioremap(offset, size) ((void __iomem *)(unsigned long)(offset))
#endif /* CONFIG_MMU */

--
2.34.1