Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Hannes Eder and committed by
David S. Miller
05076c18 1770e430

-5
-2
drivers/net/tokenring/lanstreamer.c
··· 616 616 printk("SISR Mask = %04x\n", readw(streamer_mmio + SISR_MASK)); 617 617 #endif 618 618 do { 619 - int i; 620 - 621 619 for (i = 0; i < SRB_COMMAND_SIZE; i += 2) { 622 620 writew(0, streamer_mmio + LAPDINC); 623 621 }
-2
drivers/net/tokenring/madgemc.c
··· 692 692 693 693 len += sprintf(buf+len, "-------\n"); 694 694 if (curcard) { 695 - struct net_local *tp = netdev_priv(dev); 696 - 697 695 len += sprintf(buf+len, "Card Revision: %d\n", curcard->cardrev); 698 696 len += sprintf(buf+len, "RAM Size: %dkb\n", curcard->ramsize); 699 697 len += sprintf(buf+len, "Cable type: %s\n", (curcard->cabletype)?"STP/DB9":"UTP/RJ-45");
-1
drivers/net/tokenring/olympic.c
··· 699 699 if (olympic_priv->olympic_network_monitor) { 700 700 u8 __iomem *oat; 701 701 u8 __iomem *opt; 702 - int i; 703 702 u8 addr[6]; 704 703 oat = (olympic_priv->olympic_lap + olympic_priv->olympic_addr_table_addr); 705 704 opt = (olympic_priv->olympic_lap + olympic_priv->olympic_parms_addr);