From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753992AbbERNKC (ORCPT ); Mon, 18 May 2015 09:10:02 -0400 Received: from eu-smtp-delivery-143.mimecast.com ([146.101.78.143]:63120 "EHLO eu-smtp-delivery-143.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752883AbbERNJw convert rfc822-to-8bit (ORCPT ); Mon, 18 May 2015 09:09:52 -0400 Date: Mon, 18 May 2015 14:09:48 +0100 From: Liviu Dudau To: Michal Simek Cc: "linux-arm-kernel@lists.infradead.org" , Olof Johansson , Andre Przywara , Bjorn Helgaas , "linux-kernel@vger.kernel.org" , Min-Hua Chen , Thierry Reding , Will Deacon , Catalin Marinas , Mark Rutland Subject: Re: [PATCH] arm64: Rename temp variable in read*_relaxed() Message-ID: <20150518130948.GD2175@e106497-lin.cambridge.arm.com> References: <4f9792c7d10ca30a9b6ba5e2860b56814a41309c.1431947444.git.michal.simek@xilinx.com> MIME-Version: 1.0 In-Reply-To: <4f9792c7d10ca30a9b6ba5e2860b56814a41309c.1431947444.git.michal.simek@xilinx.com> User-Agent: Mutt/1.5.22 (2013-10-16) X-OriginalArrivalTime: 18 May 2015 13:09:49.0718 (UTC) FILETIME=[EBCA5B60:01D0916B] X-MC-Unique: enJSI8PeRCyWLqc0dbVL2A-1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 18, 2015 at 12:10:48PM +0100, Michal Simek wrote: > This resolves the following sparse warning from readl() and other > macros, which ends up embedding readl_relaxed() using the same > variable. > > Warning log: > include/asm-generic/io.h:364:16: warning: symbol '__v' shadows an > earlier one > include/asm-generic/io.h:364:16: originally declared here > include/asm-generic/io.h:372:16: warning: symbol '__v' shadows an > earlier one > include/asm-generic/io.h:372:16: originally declared here > include/asm-generic/io.h:380:16: warning: symbol '__v' shadows an > earlier one > include/asm-generic/io.h:380:16: originally declared here > include/asm-generic/io.h:568:16: warning: symbol '__v' shadows an > earlier one > include/asm-generic/io.h:568:16: originally declared here > include/asm-generic/io.h:576:16: warning: symbol '__v' shadows an > earlier one > include/asm-generic/io.h:576:16: originally declared here > include/asm-generic/io.h:584:16: warning: symbol '__v' shadows an > earlier one > include/asm-generic/io.h:584:16: originally declared here > > The same patch was already applied to arm32 as > "ARM: 7118/1: rename temp variable in read*_relaxed()" > (sha1: b0c1264f534a1cb3c52036a23a04d238434a0df6) > > Signed-off-by: Michal Simek Acked-by: Liviu Dudau > --- > > arch/arm64/include/asm/io.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h > index 540f7c0aea82..cb18715cc60f 100644 > --- a/arch/arm64/include/asm/io.h > +++ b/arch/arm64/include/asm/io.h > @@ -117,10 +117,10 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) > * ordering rules but do not guarantee any ordering relative to Normal memory > * accesses. > */ > -#define readb_relaxed(c) ({ u8 __v = __raw_readb(c); __v; }) > -#define readw_relaxed(c) ({ u16 __v = le16_to_cpu((__force __le16)__raw_readw(c)); __v; }) > -#define readl_relaxed(c) ({ u32 __v = le32_to_cpu((__force __le32)__raw_readl(c)); __v; }) > -#define readq_relaxed(c) ({ u64 __v = le64_to_cpu((__force __le64)__raw_readq(c)); __v; }) > +#define readb_relaxed(c) ({ u8 __r = __raw_readb(c); __r; }) > +#define readw_relaxed(c) ({ u16 __r = le16_to_cpu((__force __le16)__raw_readw(c)); __r; }) > +#define readl_relaxed(c) ({ u32 __r = le32_to_cpu((__force __le32)__raw_readl(c)); __r; }) > +#define readq_relaxed(c) ({ u64 __r = le64_to_cpu((__force __le64)__raw_readq(c)); __r; }) > > #define writeb_relaxed(v,c) ((void)__raw_writeb((v),(c))) > #define writew_relaxed(v,c) ((void)__raw_writew((__force u16)cpu_to_le16(v),(c))) > -- > 2.3.5 > -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯