aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHannes Eder <hannes@hanneseder.net>2009-02-14 06:12:23 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-17 20:21:09 -0500
commitfbf978914e8fbc804ddbd68550bb2c7d14b2049d (patch)
tree01f666baa028f26ffc7edb10a3422af216ba9d50
parentf11bf7a31e9a3dccf893e0fceeb1d7d9fd4dfcb4 (diff)
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.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c
index 254057275e0e..d769a88ddc98 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)
897 897
898 if(csr0 & CSR0_ERR) 898 if(csr0 & CSR0_ERR)
899 { 899 {
900 struct priv *p = dev->ml_priv;
901 if(debuglevel > 1) 900 if(debuglevel > 1)
902 printk(KERN_ERR "%s: general error: %04x.\n",dev->name,csr0); 901 printk(KERN_ERR "%s: general error: %04x.\n",dev->name,csr0);
903 if(csr0 & CSR0_BABL) 902 if(csr0 & CSR0_BABL)
@@ -922,8 +921,7 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id)
922 int j; 921 int j;
923 for(j=0;j<RMDNUM;j++) 922 for(j=0;j<RMDNUM;j++)
924 { 923 {
925 struct priv *p = dev->ml_priv; 924 int i, num2;
926 int i,k,num1,num2;
927 for(i=RMDNUM-1;i>0;i--) { 925 for(i=RMDNUM-1;i>0;i--) {
928 num2 = (p->rmdnum + i) & (RMDNUM-1); 926 num2 = (p->rmdnum + i) & (RMDNUM-1);
929 if(!(p->rmdhead[num2].u.s.status & RCV_OWN)) 927 if(!(p->rmdhead[num2].u.s.status & RCV_OWN))
@@ -931,6 +929,7 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id)
931 } 929 }
932 930
933 if(i) { 931 if(i) {
932 int k, num1;
934 for(k=0;k<RMDNUM;k++) { 933 for(k=0;k<RMDNUM;k++) {
935 num1 = (p->rmdnum + k) & (RMDNUM-1); 934 num1 = (p->rmdnum + k) & (RMDNUM-1);
936 if(!(p->rmdhead[num1].u.s.status & RCV_OWN)) 935 if(!(p->rmdhead[num1].u.s.status & RCV_OWN))
@@ -942,7 +941,6 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id)
942 if(debuglevel > 0) 941 if(debuglevel > 0)
943 { 942 {
944 char buf[256],*buf1; 943 char buf[256],*buf1;
945 int k;
946 buf1 = buf; 944 buf1 = buf;
947 for(k=0;k<RMDNUM;k++) { 945 for(k=0;k<RMDNUM;k++) {
948 sprintf(buf1,"%02x ",(p->rmdhead[k].u.s.status)); /* & RCV_OWN) ); */ 946 sprintf(buf1,"%02x ",(p->rmdhead[k].u.s.status)); /* & RCV_OWN) ); */