aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-11 19:00:00 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-12 14:21:30 -0400
commitd83d282bcbf24ec8ddd4f0eb57f7ad302c431b8a (patch)
treed70019b7c94d333c84ce3610186c8cff23b635d2 /drivers/net/s2io.h
parentf344c25dbab1a392ef7a7afc8ca061b3b7285423 (diff)
s2io: Fix warnings due to -Wunused-but-set-variable.
Most of these are cases where we are trying to read back a register after a write to ensure completion. Simply pre-fixing the readl() or readq() with "(void)" is sufficient because these are volatile operations and the compiler cannot eliminate them just because no real assignment takes place. The case of free_rxd_blk()'s assignments to "struct buffAdd *ba" is a real spurious assignment as this variable is completely otherwise unused. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Jon Mason <jdmason@kudzu.us>
Diffstat (limited to 'drivers/net/s2io.h')
-rw-r--r--drivers/net/s2io.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 628fd278866a..800b3a44e653 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -1002,18 +1002,16 @@ static inline void writeq(u64 val, void __iomem *addr)
1002#define LF 2 1002#define LF 2
1003static inline void SPECIAL_REG_WRITE(u64 val, void __iomem *addr, int order) 1003static inline void SPECIAL_REG_WRITE(u64 val, void __iomem *addr, int order)
1004{ 1004{
1005 u32 ret;
1006
1007 if (order == LF) { 1005 if (order == LF) {
1008 writel((u32) (val), addr); 1006 writel((u32) (val), addr);
1009 ret = readl(addr); 1007 (void) readl(addr);
1010 writel((u32) (val >> 32), (addr + 4)); 1008 writel((u32) (val >> 32), (addr + 4));
1011 ret = readl(addr + 4); 1009 (void) readl(addr + 4);
1012 } else { 1010 } else {
1013 writel((u32) (val >> 32), (addr + 4)); 1011 writel((u32) (val >> 32), (addr + 4));
1014 ret = readl(addr + 4); 1012 (void) readl(addr + 4);
1015 writel((u32) (val), addr); 1013 writel((u32) (val), addr);
1016 ret = readl(addr); 1014 (void) readl(addr);
1017 } 1015 }
1018} 1016}
1019 1017