[PATCH v2] arc: iounmap() arg is volatile

Randy Dunlap posted 1 patch 3 years, 5 months ago
arch/arc/include/asm/io.h |    2 +-
arch/arc/mm/ioremap.c     |    2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[PATCH v2] arc: iounmap() arg is volatile
Posted by Randy Dunlap 3 years, 5 months ago
Add 'volatile' to iounmap()'s argument to prevent build warnings.
This make it the same as other major architectures.

Placates these warnings: (12 such warnings)

../drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_probe':
../drivers/video/fbdev/riva/fbdev.c:2067:42: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers]
 2067 |                 iounmap(default_par->riva.PRAMIN);

Fixes: 1162b0701b14b ("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
Cc: Arnd Bergmann <arnd@arndb.de>
---
v2: add Arnd to Cc: list

 arch/arc/include/asm/io.h |    2 +-
 arch/arc/mm/ioremap.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- 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))
Re: [PATCH v2] arc: iounmap() arg is volatile
Posted by Vineet Gupta 3 years, 5 months ago
On 10/9/22 19:28, Randy Dunlap wrote:
> Add 'volatile' to iounmap()'s argument to prevent build warnings.
> This make it the same as other major architectures.
>
> Placates these warnings: (12 such warnings)
>
> ../drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_probe':
> ../drivers/video/fbdev/riva/fbdev.c:2067:42: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers]
>   2067 |                 iounmap(default_par->riva.PRAMIN);
>
> Fixes: 1162b0701b14b ("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
> Cc: Arnd Bergmann<arnd@arndb.de>

Thx for the fix. On for-curr.

-Vineet