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

Commit b0c1264f authored by Olof Johansson's avatar Olof Johansson Committed by Russell King
Browse files

ARM: 7118/1: rename temp variable in read*_relaxed() 



This resolves the following sparse warning from readl() and other macros,
which ends up embedding readl_relaxed() using the same variable.

arch/arm/mach-tegra/dma.c:169:8: warning: symbol '__v' shadows an earlier one
arch/arm/mach-tegra/dma.c:169:8: originally declared here

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Acked-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0ec5a95b

arch/arm/include/asm/io.h

+5 −5
Original line number Diff line number Diff line
@@ -189,11 +189,11 @@ extern void _memset_io(volatile void __iomem *, int, size_t); 
 * IO port primitives for more information.

 */

#ifdef __mem_pci

#define readb_relaxed(c) ({ u8  __v = __raw_readb(__mem_pci(c)); __v; })

#define readw_relaxed(c) ({ u16 __v = le16_to_cpu((__force __le16) \

					__raw_readw(__mem_pci(c))); __v; })

#define readl_relaxed(c) ({ u32 __v = le32_to_cpu((__force __le32) \

					__raw_readl(__mem_pci(c))); __v; })

#define readb_relaxed(c) ({ u8  __r = __raw_readb(__mem_pci(c)); __r; })

#define readw_relaxed(c) ({ u16 __r = le16_to_cpu((__force __le16) \

					__raw_readw(__mem_pci(c))); __r; })

#define readl_relaxed(c) ({ u32 __r = le32_to_cpu((__force __le32) \

					__raw_readl(__mem_pci(c))); __r; })



#define writeb_relaxed(v,c)	((void)__raw_writeb(v,__mem_pci(c)))

#define writew_relaxed(v,c)	((void)__raw_writew((__force u16) \