diff options
author | Hannes Eder <hannes@hanneseder.net> | 2009-02-14 11:12:23 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-17 17:21:09 -0800 |
commit | fbf978914e8fbc804ddbd68550bb2c7d14b2049d (patch) | |
tree | 01f666baa028f26ffc7edb10a3422af216ba9d50 | |
parent | f11bf7a31e9a3dccf893e0fceeb1d7d9fd4dfcb4 (diff) | |
download | op-kernel-dev-fbf978914e8fbc804ddbd68550bb2c7d14b2049d.zip op-kernel-dev-fbf978914e8fbc804ddbd68550bb2c7d14b2049d.tar.gz |
drivers/net/ni65.c: fix sparse warnings: symbol shadows an earlier one
Impact: Remove redundant variable declaration or move them to a more
inner scope.
Fix this sparse warnings:
drivers/net/ni65.c:900:37: warning: symbol 'p' shadows an earlier one
drivers/net/ni65.c:874:21: originally declared here
drivers/net/ni65.c:925:21: warning: symbol 'p' shadows an earlier one
drivers/net/ni65.c:874:21: originally declared here
drivers/net/ni65.c:945:29: warning: symbol 'k' shadows an earlier one
drivers/net/ni65.c:926:15: originally declared here
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ni65.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c index 2540572..d769a88 100644 --- a/drivers/net/ni65.c +++ b/drivers/net/ni65.c @@ -897,7 +897,6 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id) if(csr0 & CSR0_ERR) { - struct priv *p = dev->ml_priv; if(debuglevel > 1) printk(KERN_ERR "%s: general error: %04x.\n",dev->name,csr0); if(csr0 & CSR0_BABL) @@ -922,8 +921,7 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id) int j; for(j=0;j<RMDNUM;j++) { - struct priv *p = dev->ml_priv; - int i,k,num1,num2; + int i, num2; for(i=RMDNUM-1;i>0;i--) { num2 = (p->rmdnum + i) & (RMDNUM-1); if(!(p->rmdhead[num2].u.s.status & RCV_OWN)) @@ -931,6 +929,7 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id) } if(i) { + int k, num1; for(k=0;k<RMDNUM;k++) { num1 = (p->rmdnum + k) & (RMDNUM-1); if(!(p->rmdhead[num1].u.s.status & RCV_OWN)) @@ -942,7 +941,6 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id) if(debuglevel > 0) { char buf[256],*buf1; - int k; buf1 = buf; for(k=0;k<RMDNUM;k++) { sprintf(buf1,"%02x ",(p->rmdhead[k].u.s.status)); /* & RCV_OWN) ); */ |