Skip to contentSkip to conversation

net: small cleanup of lib8390

PATCH Applied Nikanth Karthikesan 2 participants 2 messages Apr 15, 2010 – Apr 21, 2010

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Nikanth Karthikesan

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---

drivers/net/lib8390.c +6 -6
index 56f66f4..6e1dcd3 100644
@@ -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;
 	}