提交 05076c18 编写于 作者: H Hannes Eder 提交者: David S. Miller

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: NHannes Eder <hannes@hanneseder.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 1770e430
...@@ -616,8 +616,6 @@ static int streamer_open(struct net_device *dev) ...@@ -616,8 +616,6 @@ static int streamer_open(struct net_device *dev)
printk("SISR Mask = %04x\n", readw(streamer_mmio + SISR_MASK)); printk("SISR Mask = %04x\n", readw(streamer_mmio + SISR_MASK));
#endif #endif
do { do {
int i;
for (i = 0; i < SRB_COMMAND_SIZE; i += 2) { for (i = 0; i < SRB_COMMAND_SIZE; i += 2) {
writew(0, streamer_mmio + LAPDINC); writew(0, streamer_mmio + LAPDINC);
} }
......
...@@ -692,8 +692,6 @@ static int madgemc_mcaproc(char *buf, int slot, void *d) ...@@ -692,8 +692,6 @@ static int madgemc_mcaproc(char *buf, int slot, void *d)
len += sprintf(buf+len, "-------\n"); len += sprintf(buf+len, "-------\n");
if (curcard) { if (curcard) {
struct net_local *tp = netdev_priv(dev);
len += sprintf(buf+len, "Card Revision: %d\n", curcard->cardrev); len += sprintf(buf+len, "Card Revision: %d\n", curcard->cardrev);
len += sprintf(buf+len, "RAM Size: %dkb\n", curcard->ramsize); len += sprintf(buf+len, "RAM Size: %dkb\n", curcard->ramsize);
len += sprintf(buf+len, "Cable type: %s\n", (curcard->cabletype)?"STP/DB9":"UTP/RJ-45"); len += sprintf(buf+len, "Cable type: %s\n", (curcard->cabletype)?"STP/DB9":"UTP/RJ-45");
......
...@@ -699,7 +699,6 @@ static int olympic_open(struct net_device *dev) ...@@ -699,7 +699,6 @@ static int olympic_open(struct net_device *dev)
if (olympic_priv->olympic_network_monitor) { if (olympic_priv->olympic_network_monitor) {
u8 __iomem *oat; u8 __iomem *oat;
u8 __iomem *opt; u8 __iomem *opt;
int i;
u8 addr[6]; u8 addr[6];
oat = (olympic_priv->olympic_lap + olympic_priv->olympic_addr_table_addr); oat = (olympic_priv->olympic_lap + olympic_priv->olympic_addr_table_addr);
opt = (olympic_priv->olympic_lap + olympic_priv->olympic_parms_addr); opt = (olympic_priv->olympic_lap + olympic_priv->olympic_parms_addr);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册