[patch for 2.6.25? 2/3] smc91x driver: fix bug: print warning only in interrupt mode

[akpm@linux-foundation.org]

From: Sonic Zhang <sonic.zhang@analog.com>

http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3956

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Cc: Jeff Garzik <jeff@garzik.org>

On Fri, 28 Mar 2008 21:45:02 -0400 Jeff Garzik <jeff@garzik.org> wrote:

> akpm@linux-foundation.org wrote:
> > From: Sonic Zhang <sonic.zhang@analog.com>
> > 
> > http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3956
> > 
> > Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
> > Signed-off-by: Bryan Wu <cooloney@kernel.org>
> > Cc: Jeff Garzik <jeff@garzik.org>
> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> > ---
> > 
> >  drivers/net/smc91x.c |    2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff -puN drivers/net/smc91x.c~smc91x-driver-fix-bug-print-warning-only-in-interrupt-mode drivers/net/smc91x.c
> > --- a/drivers/net/smc91x.c~smc91x-driver-fix-bug-print-warning-only-in-interrupt-mode
> > +++ a/drivers/net/smc91x.c
> > @@ -1326,9 +1326,11 @@ static irqreturn_t smc_interrupt(int irq
> >  	SMC_SET_INT_MASK(lp, mask);
> >  	spin_unlock(&lp->lock);
> >  
> > +#ifndef CONFIG_NET_POLL_CONTROLLER
> >  	if (timeout == MAX_IRQ_LOOPS)
> >  		PRINTK("%s: spurious interrupt (mask = 0x%02x)\n",
> >  		       dev->name, mask);
> > +#endif
> >  	DBG(3, "%s: Interrupt done (%d loops)\n",
> >  	       dev->name, MAX_IRQ_LOOPS - timeout);
> 
> NAK
> 
> Either this code is OK or it isn't.  This patch simply hides a problem 
> inside a configuration the developer probably doesn't use.
> 
> What's the _real_ problem?  Looking at the tracker, I'd guess that some 
> events need to be masked, but are not?
> 
> If the hardware is asserting events continually, the current code does 
> the right thing -- keep processing interrupt events flagged, until (a) 
> no more events asserted or (b) max loop count reached.
> 
> So the question is to find out why you are hitting the timeout, and what 
> to do about it.

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/smc91x.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN drivers/net/smc91x.c~smc91x-driver-fix-bug-print-warning-only-in-interrupt-mode drivers/net/smc91x.c
--- a/drivers/net/smc91x.c~smc91x-driver-fix-bug-print-warning-only-in-interrupt-mode
+++ a/drivers/net/smc91x.c
@@ -1326,9 +1326,11 @@ static irqreturn_t smc_interrupt(int irq
 	SMC_SET_INT_MASK(lp, mask);
 	spin_unlock(&lp->lock);
 
+#ifndef CONFIG_NET_POLL_CONTROLLER
 	if (timeout == MAX_IRQ_LOOPS)
 		PRINTK("%s: spurious interrupt (mask = 0x%02x)\n",
 		       dev->name, mask);
+#endif
 	DBG(3, "%s: Interrupt done (%d loops)\n",
 	       dev->name, MAX_IRQ_LOOPS - timeout);
 
_