diff options
| author | Hannes Eder <hannes@hanneseder.net> | 2009-02-14 11:47:30 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-17 19:34:46 -0800 |
| commit | de2f19daac017301b0bfd73bdecff89e7ea30eb7 (patch) | |
| tree | 7a52754f9976b26ea826a0231802474946ff2c18 /drivers/net/tulip | |
| parent | 65d9b8b19dd21eeff8c051484b9e972e0b932ff2 (diff) | |
| download | op-kernel-dev-de2f19daac017301b0bfd73bdecff89e7ea30eb7.zip op-kernel-dev-de2f19daac017301b0bfd73bdecff89e7ea30eb7.tar.gz | |
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>
Diffstat (limited to 'drivers/net/tulip')
| -rw-r--r-- | drivers/net/tulip/de4x5.c | 4 | ||||
| -rw-r--r-- | drivers/net/tulip/media.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index 98e8682..6430a2e 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c @@ -3942,8 +3942,8 @@ PCI_signature(char *name, struct de4x5_private *lp) strcpy(name, "DE434/5"); return status; } else { /* Search for a DEC name in the SROM */ - int i = *((char *)&lp->srom + 19) * 3; - strncpy(name, (char *)&lp->srom + 26 + i, 8); + int tmp = *((char *)&lp->srom + 19) * 3; + strncpy(name, (char *)&lp->srom + 26 + tmp, 8); } name[8] = '\0'; for (i=0; i<siglen; i++) { diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c index 91cf9c8..daddfa5 100644 --- a/drivers/net/tulip/media.c +++ b/drivers/net/tulip/media.c @@ -69,11 +69,10 @@ int tulip_mdio_read(struct net_device *dev, int phy_id, int location) spin_lock_irqsave(&tp->mii_lock, flags); if (tp->chip_id == LC82C168) { - int i = 1000; iowrite32(0x60020000 + (phy_id<<23) + (location<<18), ioaddr + 0xA0); ioread32(ioaddr + 0xA0); ioread32(ioaddr + 0xA0); - while (--i > 0) { + for (i = 1000; i >= 0; --i) { barrier(); if ( ! ((retval = ioread32(ioaddr + 0xA0)) & 0x80000000)) break; @@ -131,13 +130,12 @@ void tulip_mdio_write(struct net_device *dev, int phy_id, int location, int val) spin_lock_irqsave(&tp->mii_lock, flags); if (tp->chip_id == LC82C168) { - int i = 1000; iowrite32(cmd, ioaddr + 0xA0); - do { + for (i = 1000; i >= 0; --i) { barrier(); if ( ! (ioread32(ioaddr + 0xA0) & 0x80000000)) break; - } while (--i > 0); + } spin_unlock_irqrestore(&tp->mii_lock, flags); return; } |
