diff options
author | Hannes Eder <hannes@hanneseder.net> | 2009-02-14 06:44:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-17 20:38:01 -0500 |
commit | 05076c1824a5cc164c3d714f7b16ac61cb9bbbf5 (patch) | |
tree | 40466f72321103cd082f89341248b6f4756433a5 /drivers | |
parent | 1770e430ca1361fb8143c328037d1a3f34391602 (diff) |
drivers/net/tokenring: fix sparse warning: symbol shadows an earlier one
Impact: Remove redundant variables.
Fix this sparse warnings:
drivers/net/tokenring/lanstreamer.c:619:21: warning: symbol 'i' shadows an earlier one
drivers/net/tokenring/lanstreamer.c:589:13: originally declared here
drivers/net/tokenring/madgemc.c:695:34: warning: symbol 'tp' shadows an earlier one
drivers/net/tokenring/madgemc.c:689:26: originally declared here
drivers/net/tokenring/olympic.c:702:21: warning: symbol 'i' shadows an earlier one
drivers/net/tokenring/olympic.c:440:13: originally declared here
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 2 | ||||
-rw-r--r-- | drivers/net/tokenring/madgemc.c | 2 | ||||
-rw-r--r-- | drivers/net/tokenring/olympic.c | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index 0b2b7925da22..f309b8f703bd 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
@@ -616,8 +616,6 @@ static int streamer_open(struct net_device *dev) | |||
616 | printk("SISR Mask = %04x\n", readw(streamer_mmio + SISR_MASK)); | 616 | printk("SISR Mask = %04x\n", readw(streamer_mmio + SISR_MASK)); |
617 | #endif | 617 | #endif |
618 | do { | 618 | do { |
619 | int i; | ||
620 | |||
621 | for (i = 0; i < SRB_COMMAND_SIZE; i += 2) { | 619 | for (i = 0; i < SRB_COMMAND_SIZE; i += 2) { |
622 | writew(0, streamer_mmio + LAPDINC); | 620 | writew(0, streamer_mmio + LAPDINC); |
623 | } | 621 | } |
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c index 917b4d201e09..193308118f95 100644 --- a/drivers/net/tokenring/madgemc.c +++ b/drivers/net/tokenring/madgemc.c | |||
@@ -692,8 +692,6 @@ static int madgemc_mcaproc(char *buf, int slot, void *d) | |||
692 | 692 | ||
693 | len += sprintf(buf+len, "-------\n"); | 693 | len += sprintf(buf+len, "-------\n"); |
694 | if (curcard) { | 694 | if (curcard) { |
695 | struct net_local *tp = netdev_priv(dev); | ||
696 | |||
697 | len += sprintf(buf+len, "Card Revision: %d\n", curcard->cardrev); | 695 | len += sprintf(buf+len, "Card Revision: %d\n", curcard->cardrev); |
698 | len += sprintf(buf+len, "RAM Size: %dkb\n", curcard->ramsize); | 696 | len += sprintf(buf+len, "RAM Size: %dkb\n", curcard->ramsize); |
699 | len += sprintf(buf+len, "Cable type: %s\n", (curcard->cabletype)?"STP/DB9":"UTP/RJ-45"); | 697 | len += sprintf(buf+len, "Cable type: %s\n", (curcard->cabletype)?"STP/DB9":"UTP/RJ-45"); |
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index 77dc9da4c0b9..d068a9d36883 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c | |||
@@ -699,7 +699,6 @@ static int olympic_open(struct net_device *dev) | |||
699 | if (olympic_priv->olympic_network_monitor) { | 699 | if (olympic_priv->olympic_network_monitor) { |
700 | u8 __iomem *oat; | 700 | u8 __iomem *oat; |
701 | u8 __iomem *opt; | 701 | u8 __iomem *opt; |
702 | int i; | ||
703 | u8 addr[6]; | 702 | u8 addr[6]; |
704 | oat = (olympic_priv->olympic_lap + olympic_priv->olympic_addr_table_addr); | 703 | oat = (olympic_priv->olympic_lap + olympic_priv->olympic_addr_table_addr); |
705 | opt = (olympic_priv->olympic_lap + olympic_priv->olympic_parms_addr); | 704 | opt = (olympic_priv->olympic_lap + olympic_priv->olympic_parms_addr); |