diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-10-19 11:14:03 +0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-10-24 03:53:16 +0400 |
commit | 1daec86ad11383845274e032d1b90620258dc87d (patch) | |
tree | 01fb555646b490dd494e1d51869c6f1d51cba7e7 /drivers/net/netxen | |
parent | 06efcad0d43a5491602f7d7bfc1ce997cdb0d062 (diff) | |
download | linux-1daec86ad11383845274e032d1b90620258dc87d.tar.xz |
[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: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/netxen')
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 601051c584e8..a80f0cd6b528 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/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 */ |