Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccaeef12 authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman
Browse files

arc: iounmap() arg is volatile 



[ Upstream commit c44f15c1c09481d50fd33478ebb5b8284f8f5edb ]

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: 1162b070 ("ARC: I/O and DMA Mappings")
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: linux-snps-arc@lists.infradead.org
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarVineet Gupta <vgupta@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fa434a64

arch/arc/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static inline void ioport_unmap(void __iomem *addr) 
{

}



extern void iounmap(const void __iomem *addr);

extern void iounmap(const volatile void __iomem *addr);



#define ioremap_nocache(phy, sz)	ioremap(phy, sz)

#define ioremap_wc(phy, sz)		ioremap(phy, sz)

arch/arc/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ void __iomem *ioremap_prot(phys_addr_t paddr, unsigned long size, 
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))