Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6846ad28 authored by Nikanth Karthikesan's avatar Nikanth Karthikesan Committed by David S. Miller
Browse files

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: default avatarNikanth Karthikesan <knikanth@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 989a2979

drivers/net/lib8390.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -445,14 +445,14 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id) 




	if (ei_local->irqlock)

	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. */

		 * This might just be an interrupt for a PCI device sharing

		printk(ei_local->irqlock

		 * this line

			   ? "%s: Interrupted while interrupts are masked! isr=%#2x imr=%#2x.\n"

		 */

			   : "%s: Reentering the interrupt handler! isr=%#2x imr=%#2x.\n",

		printk("%s: Interrupted while interrupts are masked!"

			   " isr=%#2x imr=%#2x.\n",

			   dev->name, ei_inb_p(e8390_base + EN0_ISR),

			   dev->name, ei_inb_p(e8390_base + EN0_ISR),

			   ei_inb_p(e8390_base + EN0_IMR));

			   ei_inb_p(e8390_base + EN0_IMR));

#endif

		spin_unlock(&ei_local->page_lock);

		spin_unlock(&ei_local->page_lock);

		return IRQ_NONE;

		return IRQ_NONE;

	}

	}