| Message ID | 20220811025530.2484-1-rdunlap@infradead.org |
|---|---|
| State | New |
| Headers | show |
| Series | ARC: align iounmap() argument with other architectures | expand |
--- a/arch/arc/include/asm/io.h +++ b/arch/arc/include/asm/io.h @@ -32,7 +32,7 @@ static inline void ioport_unmap(void __i { } -extern void iounmap(const void __iomem *addr); +extern void iounmap(const volatile void __iomem *addr); /* * io{read,write}{16,32}be() macros --- a/arch/arc/mm/ioremap.c +++ b/arch/arc/mm/ioremap.c @@ -94,7 +94,7 @@ void __iomem *ioremap_prot(phys_addr_t p EXPORT_SYMBOL(ioremap_prot); -void iounmap(const void __iomem *addr) +void iounmap(const volatile void __iomem *addr) { /* weird double cast to handle phys_addr_t > 32 bits */ if (arc_uncached_addr_space((phys_addr_t)(u32)addr))
Add 'volatile' to iounmap()'s argument to prevent build warnings. This make it the same as other major architectures. Example (one of many): drivers/scsi/aacraid/nark.c: In function 'aac_nark_ioremap': drivers/scsi/aacraid/nark.c:36:28: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers] 36 | iounmap(dev->base); In file included from ../include/linux/io.h:13, from ../include/linux/irq.h:20, from ../include/asm-generic/hardirq.h:17, from ./arch/arc/include/generated/asm/hardirq.h:1, from ../include/linux/hardirq.h:11, from ../include/linux/interrupt.h:11, from ../include/linux/pci.h:38, from ../drivers/scsi/aacraid/nark.c:18: arch/arc/include/asm/io.h:35:41: note: expected 'const void *' but argument is of type 'volatile void *' 35 | extern void iounmap(const void __iomem *addr); Fixes: 1162b0701b14 ("ARC: I/O and DMA Mappings") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Vineet Gupta <vgupta@kernel.org> Cc: linux-snps-arc@lists.infradead.org --- arch/arc/include/asm/io.h | 2 +- arch/arc/mm/ioremap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)