Commit fbf97891 authored by Hannes Eder's avatar Hannes Eder Committed by David S. Miller

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: default avatarHannes Eder <hannes@hanneseder.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f11bf7a3
...@@ -897,7 +897,6 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id) ...@@ -897,7 +897,6 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id)
if(csr0 & CSR0_ERR) if(csr0 & CSR0_ERR)
{ {
struct priv *p = dev->ml_priv;
if(debuglevel > 1) if(debuglevel > 1)
printk(KERN_ERR "%s: general error: %04x.\n",dev->name,csr0); printk(KERN_ERR "%s: general error: %04x.\n",dev->name,csr0);
if(csr0 & CSR0_BABL) if(csr0 & CSR0_BABL)
...@@ -922,8 +921,7 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id) ...@@ -922,8 +921,7 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id)
int j; int j;
for(j=0;j<RMDNUM;j++) for(j=0;j<RMDNUM;j++)
{ {
struct priv *p = dev->ml_priv; int i, num2;
int i,k,num1,num2;
for(i=RMDNUM-1;i>0;i--) { for(i=RMDNUM-1;i>0;i--) {
num2 = (p->rmdnum + i) & (RMDNUM-1); num2 = (p->rmdnum + i) & (RMDNUM-1);
if(!(p->rmdhead[num2].u.s.status & RCV_OWN)) if(!(p->rmdhead[num2].u.s.status & RCV_OWN))
...@@ -931,6 +929,7 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id) ...@@ -931,6 +929,7 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id)
} }
if(i) { if(i) {
int k, num1;
for(k=0;k<RMDNUM;k++) { for(k=0;k<RMDNUM;k++) {
num1 = (p->rmdnum + k) & (RMDNUM-1); num1 = (p->rmdnum + k) & (RMDNUM-1);
if(!(p->rmdhead[num1].u.s.status & RCV_OWN)) if(!(p->rmdhead[num1].u.s.status & RCV_OWN))
...@@ -942,7 +941,6 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id) ...@@ -942,7 +941,6 @@ static irqreturn_t ni65_interrupt(int irq, void * dev_id)
if(debuglevel > 0) if(debuglevel > 0)
{ {
char buf[256],*buf1; char buf[256],*buf1;
int k;
buf1 = buf; buf1 = buf;
for(k=0;k<RMDNUM;k++) { for(k=0;k<RMDNUM;k++) {
sprintf(buf1,"%02x ",(p->rmdhead[k].u.s.status)); /* & RCV_OWN) ); */ sprintf(buf1,"%02x ",(p->rmdhead[k].u.s.status)); /* & RCV_OWN) ); */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment