Merge branch 'irq-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

* 'irq-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  [SPARC, XEN, NET/CXGB3] use irq_handler_t where appropriate
  drivers/char/riscom8: clean up irq handling
  isdn/sc: irq handler clean
  isdn/act2000: fix major bug. clean irq handler.
  char/pcmcia/synclink_cs: trim trailing whitespace
  drivers/char/ip2: separate polling and irq-driven work entry points
  drivers/char/ip2: split out irq core logic into separate function
  [NETDRVR] lib82596, netxen: delete pointless tests from irq handler
  Eliminate pointless casts from void* in a few driver irq handlers.
  [PARPORT] Remove unused 'irq' argument from parport irq functions
  [PARPORT] Kill useful 'irq' arg from parport_{generic_irq,ieee1284_interrupt}
  [PARPORT] Consolidate code copies into a single generic irq handler

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