From 6cb12cc90b0c11dabad3b327edb43886b155a3e3 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 19 Oct 2007 03:14:03 -0400
Subject: [PATCH] --- yaml --- r: 72444 b: refs/heads/master c:
 1daec86ad11383845274e032d1b90620258dc87d h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/net/lib82596.c               |  8 +-------
 trunk/drivers/net/netxen/netxen_nic_main.c | 11 ++---------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 96b312abe003..6351f9f43b7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06efcad0d43a5491602f7d7bfc1ce997cdb0d062
+refs/heads/master: 1daec86ad11383845274e032d1b90620258dc87d
diff --git a/trunk/drivers/net/lib82596.c b/trunk/drivers/net/lib82596.c
index ffaa14f2cd01..9a855e512147 100644
--- a/trunk/drivers/net/lib82596.c
+++ b/trunk/drivers/net/lib82596.c
@@ -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;
 
diff --git a/trunk/drivers/net/netxen/netxen_nic_main.c b/trunk/drivers/net/netxen/netxen_nic_main.c
index 601051c584e8..a80f0cd6b528 100644
--- a/trunk/drivers/net/netxen/netxen_nic_main.c
+++ b/trunk/drivers/net/netxen/netxen_nic_main.c
@@ -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 */