* [PATCH] net: small cleanup of lib8390
@ 2010-04-15 12:21 Nikanth Karthikesan
2010-04-21 23:23 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Nikanth Karthikesan @ 2010-04-15 12:21 UTC (permalink / raw)
To: Paul Gortmaker, David S. Miller; +Cc: netdev, Al Viro, Jeff Garzik
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>
---
diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
index 56f66f4..6e1dcd3 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;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: small cleanup of lib8390
2010-04-15 12:21 [PATCH] net: small cleanup of lib8390 Nikanth Karthikesan
@ 2010-04-21 23:23 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-04-21 23:23 UTC (permalink / raw)
To: knikanth; +Cc: p_gortmaker, netdev, viro, jeff
From: Nikanth Karthikesan <knikanth@suse.de>
Date: Thu, 15 Apr 2010 17:51:23 +0530
> 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>
Applied to net-next-2.6, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-21 23:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-15 12:21 [PATCH] net: small cleanup of lib8390 Nikanth Karthikesan
2010-04-21 23:23 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).