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

drivers/net/tulip: fix sparse warning: symbol shadows an earlier one

Impact: Rename a local variable resp. remove a redundant variable and
while being at it use more unform loop constructs.

Fix this sparse warning:
drivers/net/tulip/de4x5.c:3944:13: warning: symbol 'i' shadows an earlier one
drivers/net/tulip/de4x5.c:3938:9: originally declared here
drivers/net/tulip/media.c:72:21: warning: symbol 'i' shadows an earlier one
drivers/net/tulip/media.c:54:13: originally declared here
drivers/net/tulip/media.c:134:21: warning: symbol 'i' shadows an earlier one
drivers/net/tulip/media.c:117: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
de2f19da 65d9b8b1

+5 -7
+2 -2
drivers/net/tulip/de4x5.c
··· 3942 3942 strcpy(name, "DE434/5"); 3943 3943 return status; 3944 3944 } else { /* Search for a DEC name in the SROM */ 3945 - int i = *((char *)&lp->srom + 19) * 3; 3946 - strncpy(name, (char *)&lp->srom + 26 + i, 8); 3945 + int tmp = *((char *)&lp->srom + 19) * 3; 3946 + strncpy(name, (char *)&lp->srom + 26 + tmp, 8); 3947 3947 } 3948 3948 name[8] = '\0'; 3949 3949 for (i=0; i<siglen; i++) {
+3 -5
drivers/net/tulip/media.c
··· 69 69 70 70 spin_lock_irqsave(&tp->mii_lock, flags); 71 71 if (tp->chip_id == LC82C168) { 72 - int i = 1000; 73 72 iowrite32(0x60020000 + (phy_id<<23) + (location<<18), ioaddr + 0xA0); 74 73 ioread32(ioaddr + 0xA0); 75 74 ioread32(ioaddr + 0xA0); 76 - while (--i > 0) { 75 + for (i = 1000; i >= 0; --i) { 77 76 barrier(); 78 77 if ( ! ((retval = ioread32(ioaddr + 0xA0)) & 0x80000000)) 79 78 break; ··· 130 131 131 132 spin_lock_irqsave(&tp->mii_lock, flags); 132 133 if (tp->chip_id == LC82C168) { 133 - int i = 1000; 134 134 iowrite32(cmd, ioaddr + 0xA0); 135 - do { 135 + for (i = 1000; i >= 0; --i) { 136 136 barrier(); 137 137 if ( ! (ioread32(ioaddr + 0xA0) & 0x80000000)) 138 138 break; 139 - } while (--i > 0); 139 + } 140 140 spin_unlock_irqrestore(&tp->mii_lock, flags); 141 141 return; 142 142 }