Commit 130a14f4 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] 3c59x irqreturn fix

Apparently boomerang_interrupt() is generating lots of "nobody cared"
warnings - one per packet it seems.  Frankly, I don't have a clue why.

These are ancient cards and the driver is otherwise stable, so just
change it to return IRQ_HANDLED and move on...
parent 03feb9db
...@@ -2321,7 +2321,6 @@ boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -2321,7 +2321,6 @@ boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs)
long ioaddr; long ioaddr;
int status; int status;
int work_done = max_interrupt_work; int work_done = max_interrupt_work;
int handled;
ioaddr = dev->base_addr; ioaddr = dev->base_addr;
...@@ -2336,18 +2335,14 @@ boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -2336,18 +2335,14 @@ boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs)
if (vortex_debug > 6) if (vortex_debug > 6)
printk(KERN_DEBUG "boomerang_interrupt. status=0x%4x\n", status); printk(KERN_DEBUG "boomerang_interrupt. status=0x%4x\n", status);
if ((status & IntLatch) == 0) { if ((status & IntLatch) == 0)
handled = 0;
goto handler_exit; /* No interrupt: shared IRQs can cause this */ goto handler_exit; /* No interrupt: shared IRQs can cause this */
}
if (status == 0xffff) { /* h/w no longer present (hotplug)? */ if (status == 0xffff) { /* h/w no longer present (hotplug)? */
if (vortex_debug > 1) if (vortex_debug > 1)
printk(KERN_DEBUG "boomerang_interrupt(1): status = 0xffff\n"); printk(KERN_DEBUG "boomerang_interrupt(1): status = 0xffff\n");
handled = 0;
goto handler_exit; goto handler_exit;
} }
handled = 1;
if (status & IntReq) { if (status & IntReq) {
status |= vp->deferred; status |= vp->deferred;
...@@ -2442,7 +2437,7 @@ boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -2442,7 +2437,7 @@ boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs)
dev->name, status); dev->name, status);
handler_exit: handler_exit:
spin_unlock(&vp->lock); spin_unlock(&vp->lock);
return IRQ_RETVAL(handled); return IRQ_HANDLED;
} }
static int vortex_rx(struct net_device *dev) static int vortex_rx(struct net_device *dev)
......
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