diff options
| author | Nikanth Karthikesan <knikanth@suse.de> | 2010-04-15 06:21:23 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-22 03:23:30 +0400 |
| commit | 6846ad282693bd066645aff6f13d2b279d505314 (patch) | |
| tree | 759596ef63453c26aa9d49692cef953a9294acdc /drivers | |
| parent | 989a2979205dd34269382b357e6d4b4b6956b889 (diff) | |
| download | linux-6846ad282693bd066645aff6f13d2b279d505314.tar.xz | |
net: small cleanup of lib8390
Remove the always true #if 1. Also the unecessary re-test of ei_local->irqlock
and the unreachable printk format string.
Signed-off-by: Nikanth Karthikesan <knikanth@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/lib8390.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c index 526dc9cbc3c6..770b606a9e3a 100644 --- a/drivers/net/lib8390.c +++ b/drivers/net/lib8390.c @@ -445,14 +445,14 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id) if (ei_local->irqlock) { -#if 1 /* This might just be an interrupt for a PCI device sharing this line */ - /* The "irqlock" check is only for testing. */ - printk(ei_local->irqlock - ? "%s: Interrupted while interrupts are masked! isr=%#2x imr=%#2x.\n" - : "%s: Reentering the interrupt handler! isr=%#2x imr=%#2x.\n", + /* + * This might just be an interrupt for a PCI device sharing + * this line + */ + printk("%s: Interrupted while interrupts are masked!" + " isr=%#2x imr=%#2x.\n", dev->name, ei_inb_p(e8390_base + EN0_ISR), ei_inb_p(e8390_base + EN0_IMR)); -#endif spin_unlock(&ei_local->page_lock); return IRQ_NONE; } |