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

Commit 1daec86a authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[NETDRVR] lib82596, netxen: delete pointless tests from irq handler 



Remove always-false tests in irq handler.

Also a few other minor cleanups.

Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 06efcad0

drivers/net/lib82596.c

+1 −7
Original line number Diff line number Diff line
@@ -1124,12 +1124,6 @@ static irqreturn_t i596_interrupt(int irq, void *dev_id) 
	struct i596_dma *dma;

	unsigned short status, ack_cmd = 0;



	if (dev == NULL) {

		printk(KERN_WARNING "%s: irq %d for unknown device.\n",

		       __FUNCTION__, irq);

		return IRQ_NONE;

	}



	lp = netdev_priv(dev);

	dma = lp->dma;
@@ -1140,7 +1134,7 @@ static irqreturn_t i596_interrupt(int irq, void *dev_id) 


	DEB(DEB_INTS, printk(KERN_DEBUG

			     "%s: i596 interrupt, IRQ %d, status %4.4x.\n",

			dev->name, irq, status));

			dev->name, dev->irq, status));



	ack_cmd = status & 0xf000;

drivers/net/netxen/netxen_nic_main.c

+2 −9
Original line number Diff line number Diff line
@@ -1268,17 +1268,10 @@ netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev) 
 */

irqreturn_t netxen_intr(int irq, void *data)

{

	struct netxen_adapter *adapter;

	struct net_device *netdev;

	struct netxen_adapter *adapter = data;

	struct net_device *netdev = adapter->netdev;

	u32 our_int = 0;



	if (unlikely(!irq)) {

		return IRQ_NONE;	/* Not our interrupt */

	}



	adapter = (struct netxen_adapter *)data;

	netdev  = adapter->netdev;



	if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {

		our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));

		/* not our interrupt */