Skip to content

Commit d684e0a

Browse files
geertuakpm00
authored andcommitted
sh: convert nommu io{re,un}map() to static inline functions
Recently, nommu iounmap() was converted from a static inline function to a macro again, basically reverting commit 4580ba4 ("sh: Convert iounmap() macros to inline functions"). With -Werror, this leads to build failures like: drivers/iio/adc/xilinx-ams.c: In function `ams_iounmap_ps': drivers/iio/adc/xilinx-ams.c:1195:14: error: unused variable `ams' [-Werror=unused-variable] 1195 | struct ams *ams = data; | ^~~ Fix this by replacing the macros for ioremap() and iounmap() by static inline functions, based on <asm-generic/io.h>. Link: https://lkml.kernel.org/r/8d1b1766260961799b04035e7bc39a7f59729f72.1655708312.git.geert+renesas@glider.be Fixes: 13f1fc8 ("sh: move the ioremap implementation out of line") Signed-off-by: Geert Uytterhoeven <[email protected]> Reported-by: kernel test robot <[email protected]> Reported-by: Jonathan Cameron <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 73f37db commit d684e0a

File tree

1 file changed

+6
-2
lines changed
  • arch/sh/include/asm

1 file changed

+6
-2
lines changed

arch/sh/include/asm/io.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,12 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset, unsigned long size,
271271
#endif /* CONFIG_HAVE_IOREMAP_PROT */
272272

273273
#else /* CONFIG_MMU */
274-
#define iounmap(addr) do { } while (0)
275-
#define ioremap(offset, size) ((void __iomem *)(unsigned long)(offset))
274+
static inline void __iomem *ioremap(phys_addr_t offset, size_t size)
275+
{
276+
return (void __iomem *)(unsigned long)offset;
277+
}
278+
279+
static inline void iounmap(volatile void __iomem *addr) { }
276280
#endif /* CONFIG_MMU */
277281

278282
#define ioremap_uc ioremap

0 commit comments

Comments
 (0)