Skip to contentSkip to conversation

ARM: Fix sparse warnings due to variables conflicts.

PATCH New Nishanth Menon 6 participants 6 messages Oct 8, 2010 – Oct 14, 2010 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH v4 1/1 ARM: Fix sparse warnings due to variables conflicts.

Poddar, Sourav had written, on 10/08/2010 12:53 AM, the following:

Quoted 7 lines

Fix the sparse warnings generated due to conflicts in variables used in readl/writel.

drivers/net/smc91x.c:312:8: warning: symbol '__v' shadows an earlier one drivers/net/smc91x.c:312:8: originally declared here

With this change, about 200 sparse warnings are fixed.

The commit message could be a little more detailed. see http://marc.info/?l=linux-omap&m=128648102511076&w=2

also should $subject say ARM: io: fix namespace conflict
to better reflect the fix? sparse warnings are just an indication IMHO

Quoted 55 lines
---
 arch/arm/include/asm/io.h |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)
arch/arm/include/asm/io.h +11 -11
index 1261b1f..2daecb6 100644
@@ -131,11 +131,11 @@ static inline void __iomem *__typesafe_io(unsigned long addr)
 #define outl(v,p)		__raw_writel((__force __u32) \
 					cpu_to_le32(v),__io(p))
 
-#define inb(p)	({ __u8 __v = __raw_readb(__io(p)); __v; })
-#define inw(p)	({ __u16 __v = le16_to_cpu((__force __le16) \
-			__raw_readw(__io(p))); __v; })
-#define inl(p)	({ __u32 __v = le32_to_cpu((__force __le32) \
-			__raw_readl(__io(p))); __v; })
+#define inb(p)	({ __u8 __inbv = __raw_readb(__io(p)); __inbv; })
+#define inw(p)	({ __u16 __inwv = le16_to_cpu((__force __le16) \
+			__raw_readw(__io(p))); __inwv; })
+#define inl(p)	({ __u32 __inlv = le32_to_cpu((__force __le32) \
+			__raw_readl(__io(p))); __inlv; })
 
 #define outsb(p,d,l)		__raw_writesb(__io(p),d,l)
 #define outsw(p,d,l)		__raw_writesw(__io(p),d,l)
@@ -200,9 +200,9 @@ extern void _memset_io(volatile void __iomem *, int, size_t);
 #define __iowmb()		do { } while (0)
 #endif
 
-#define readb(c)		({ u8  __v = readb_relaxed(c); __iormb(); __v; })
-#define readw(c)		({ u16 __v = readw_relaxed(c); __iormb(); __v; })
-#define readl(c)		({ u32 __v = readl_relaxed(c); __iormb(); __v; })
+#define readb(c)		({ u8  __readbv = readb_relaxed(c); __iormb(); __readbv; })
+#define readw(c)		({ u16 __readwv = readw_relaxed(c); __iormb(); __readwv; })
+#define readl(c)		({ u32 __readlv = readl_relaxed(c); __iormb(); __readlv; })
 
 #define writeb(v,c)		({ __iowmb(); writeb_relaxed(v,c); })
 #define writew(v,c)		({ __iowmb(); writew_relaxed(v,c); })
@@ -258,9 +258,9 @@ extern void _memset_io(volatile void __iomem *, int, size_t);
  * io{read,write}{8,16,32} macros
  */
 #ifndef ioread8
-#define ioread8(p)	({ unsigned int __v = __raw_readb(p); __iormb(); __v; })
-#define ioread16(p)	({ unsigned int __v = le16_to_cpu((__force __le16)__raw_readw(p)); __iormb(); __v; })
-#define ioread32(p)	({ unsigned int __v = le32_to_cpu((__force __le32)__raw_readl(p)); __iormb(); __v; })
+#define ioread8(p)	({ unsigned int __ioread8v = __raw_readb(p); __iormb(); __ioread8v; })
+#define ioread16(p)	({ unsigned int __ioread16v = le16_to_cpu((__force __le16)__raw_readw(p)); __iormb(); __ioread16v; })
+#define ioread32(p)	({ unsigned int __ioread32v = le32_to_cpu((__force __le32)__raw_readl(p)); __iormb(); __ioread32v; })
 
 #define iowrite8(v,p)	({ __iowmb(); (void)__raw_writeb(v, p); })
 #define iowrite16(v,p)	({ __iowmb(); (void)__raw_writew((__force __u16)cpu_to_le16(v), p); })
Signature · 2 lines
Regards,
Nishanth Menon
#2 lore raw

PATCH v4 1/1 ARM: Fix sparse warnings due to variables conflicts.

Quoted 7 lines · Nishanth Menon

Poddar, Sourav had written, on 10/08/2010 12:53 AM, the following:

Quoted 6 lines

Fix the sparse warnings generated due to conflicts in variables used in readl/writel.

drivers/net/smc91x.c:312:8: warning: symbol '__v' shadows an earlier one drivers/net/smc91x.c:312:8: originally declared here

Quoted 6 lines
Quoted 1 line

With this change, about 200 sparse warnings are fixed.

The commit message could be a little more detailed. see http://marc.info/?l=linux-omap&m=128648102511076&w=2

also should $subject say ARM: io: fix namespace conflict
to better reflect the fix? sparse warnings are just an indication IMHO

BTW, also dropping the "OMAP: Convert write/read functions to raw read/write".

That patch does not compute, and also ends up leaving files with __raw_readw followed by writew..

Regards,

Tony

#3 lore raw

PATCH v4 1/1 ARM: Fix sparse warnings due to variables conflicts.

Tony,

Quoted 25 lines

-----Original Message-----
From: Tony Lindgren [mailto:tony at atomide.com]
Sent: Friday, October 08, 2010 11:06 PM
To: Menon, Nishanth
Cc: Poddar, Sourav; linux-omap at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Shilimkar, Santosh; G, Manjunath Kondaiah; Varadarajan, Charulatha
Subject: Re: [PATCH v4] ARM: Fix sparse warnings due to variables conflicts.

Quoted 2 lines · Nishanth Menon

Poddar, Sourav had written, on 10/08/2010 12:53 AM, the following:

Quoted 1 line

Fix the sparse warnings generated due to conflicts in

variables used in readl/writel.

Quoted 3 lines
Quoted 3 lines

drivers/net/smc91x.c:312:8: warning: symbol '__v' shadows

an earlier

Quoted 7 lines
Quoted 4 lines

one
drivers/net/smc91x.c:312:8: originally declared here

With this change, about 200 sparse warnings are fixed.

The commit message could be a little more detailed. see http://marc.info/?l=linux-omap&m=128648102511076&w=2

Quoted 9 lines
Quoted 2 lines

also should $subject say ARM: io: fix namespace conflict to better reflect the fix? sparse warnings are just an indication IMHO

BTW, also dropping the "OMAP: Convert write/read functions to raw read/write".

That patch does not compute, and also ends up leaving files with __raw_readw followed by writew..

Why to revert patch "OMAP: Convert write/read functions to raw read/write" since we need to replace other __raw_read/__raw_writel functions if above patch gets accepted.

-Manjunath

#4 lore raw

PATCH v4 1/1 ARM: Fix sparse warnings due to variables conflicts.

In reply to Nishanth Menon
Quoted 7 lines · Nishanth Menon

Poddar, Sourav had written, on 10/08/2010 12:53 AM, the following:

Quoted 6 lines

Fix the sparse warnings generated due to conflicts in variables used in readl/writel.

drivers/net/smc91x.c:312:8: warning: symbol '__v' shadows an earlier one drivers/net/smc91x.c:312:8: originally declared here

Quoted 6 lines
Quoted 1 line

With this change, about 200 sparse warnings are fixed.

The commit message could be a little more detailed. see http://marc.info/?l=linux-omap&m=128648102511076&w=2

also should $subject say ARM: io: fix namespace conflict
to better reflect the fix? sparse warnings are just an indication IMHO

afaics, this patch will cause checkpatch to issue warnings due to lines over 80 characters.

I can't check that because I don't have the original patch via the linux-arm-kernel mailing list.

#5 lore raw

PATCH v4 1/1 ARM: Fix sparse warnings due to variables conflicts.

Quoted 22 lines

-----Original Message-----
From: Russell King - ARM Linux [mailto:linux at arm.linux.org.uk]
Sent: Saturday, October 09, 2010 4:53 AM
To: Menon, Nishanth
Cc: Poddar, Sourav; G, Manjunath Kondaiah;
linux-omap at vger.kernel.org; Shilimkar, Santosh; linux-arm-kernel at lists.infradead.org; Varadarajan, Charulatha
Subject: Re: [PATCH v4] ARM: Fix sparse warnings due to variables conflicts.

Quoted 2 lines · Nishanth Menon

Poddar, Sourav had written, on 10/08/2010 12:53 AM, the following:

Quoted 1 line

Fix the sparse warnings generated due to conflicts in

variables used in readl/writel.

Quoted 3 lines
Quoted 3 lines

drivers/net/smc91x.c:312:8: warning: symbol '__v' shadows

an earlier one

Quoted 2 lines
Quoted 2 lines

drivers/net/smc91x.c:312:8: originally declared here

Quoted 7 lines
Quoted 6 lines
Quoted 1 line

With this change, about 200 sparse warnings are fixed.

The commit message could be a little more detailed. see http://marc.info/?l=linux-omap&m=128648102511076&w=2

also should $subject say ARM: io: fix namespace conflict to better reflect the fix? sparse warnings are just an

indication IMHO

That sounds more appropriate. Thanks.

Quoted 4 lines

afaics, this patch will cause checkpatch to issue warnings due to lines
over 80 characters.

Okay. The patch was not touching the coding style of how the macros were defined earlier. Anyways, would fix the warnings and send the patch asap.

Quoted 4 lines

I can't check that because I don't have the original patch via the linux-arm-kernel mailing list.

#6 lore raw

PATCH v4 1/1 ARM: Fix sparse warnings due to variables conflicts.

In reply to Russell King - ARM Linux
Quoted 15 lines · Russell King - ARM Linux
Quoted 13 lines · Nishanth Menon

Poddar, Sourav had written, on 10/08/2010 12:53 AM, the following:

Quoted 8 lines

Fix the sparse warnings generated due to conflicts in variables used in readl/writel.

drivers/net/smc91x.c:312:8: warning: symbol '__v' shadows an earlier one drivers/net/smc91x.c:312:8: originally declared here

With this change, about 200 sparse warnings are fixed.

The commit message could be a little more detailed. see http://marc.info/?l=linux-omap&m=128648102511076&w=2

Quoted 9 lines
Quoted 3 lines

also should $subject say ARM: io: fix namespace conflict
to better reflect the fix? sparse warnings are just an indication IMHO

afaics, this patch will cause checkpatch to issue warnings due to lines over 80 characters.

I can't check that because I don't have the original patch via the linux-arm-kernel mailing list.

Hi,

I have posted a new patch with the checkpatch issues fixed. Link to this patch is:
http://marc.info/?l=linux-arm-kernel&m=128697013901237&w=2

Regards,
Sourav