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>

diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
index 526dc9cbc3c61875fc148ce19daee27881345b35..770b606a9e3a6f034bc1930c13bc9d98f99fa8f0 100644 (file)
--- 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;
        }