commit 93e93ce573545b3702477088cba8650b565fd60e
Author: Jeff Garzik <jeff@garzik.org>
Date:   Fri Oct 19 00:47:56 2007 -0400

    [IRQ ARG REMOVAL] trivial net driver updates

 drivers/net/3c501.c                         |    3 +--
 drivers/net/3c501.h                         |    2 +-
 drivers/net/3c505.c                         |    2 +-
 drivers/net/3c507.c                         |    4 ++--
 drivers/net/3c509.c                         |    6 +++---
 drivers/net/3c515.c                         |    4 ++--
 drivers/net/3c523.c                         |    4 ++--
 drivers/net/3c527.c                         |    4 ++--
 drivers/net/3c59x.c                         |   14 +++++++-------
 drivers/net/7990.c                          |    4 ++--
 drivers/net/8139cp.c                        |    4 ++--
 drivers/net/8139too.c                       |    6 +++---
 drivers/net/82596.c                         |    6 +++---
 drivers/net/8390.c                          |    4 ++--
 drivers/net/8390.h                          |    2 +-
 drivers/net/a2065.c                         |    2 +-
 drivers/net/acenic.c                        |    2 +-
 drivers/net/acenic.h                        |    2 +-
 drivers/net/amd8111e.c                      |    4 ++--
 drivers/net/apne.c                          |    4 ++--
 drivers/net/appletalk/cops.c                |    4 ++--
 drivers/net/appletalk/ltpc.c                |    2 +-
 drivers/net/arcnet/arcnet.c                 |    2 +-
 drivers/net/ariadne.c                       |    4 ++--
 drivers/net/arm/am79c961a.c                 |    6 +++---
 drivers/net/arm/at91_ether.c                |    4 ++--
 drivers/net/arm/ep93xx_eth.c                |    2 +-
 drivers/net/arm/ether1.c                    |    4 ++--
 drivers/net/arm/ether3.c                    |    4 ++--
 drivers/net/at1700.c                        |    4 ++--
 drivers/net/atarilance.c                    |    4 ++--
 drivers/net/atl1/atl1_main.c                |    4 ++--
 drivers/net/atp.c                           |    4 ++--
 drivers/net/au1000_eth.c                    |    4 ++--
 drivers/net/b44.c                           |    4 ++--
 drivers/net/bmac.c                          |   12 ++++++------
 drivers/net/bnx2.c                          |    8 ++++----
 drivers/net/cassini.c                       |    8 ++++----
 drivers/net/chelsio/cxgb2.c                 |    2 +-
 drivers/net/chelsio/sge.c                   |    4 ++--
 drivers/net/chelsio/sge.h                   |    2 +-
 drivers/net/cris/eth_v10.c                  |    8 ++++----
 drivers/net/cs89x0.c                        |    6 +++---
 drivers/net/cxgb3/cxgb3_main.c              |    4 ++--
 drivers/net/cxgb3/sge.c                     |   14 +++++++-------
 drivers/net/de600.c                         |    2 +-
 drivers/net/de600.h                         |    2 +-
 drivers/net/de620.c                         |    4 ++--
 drivers/net/declance.c                      |    4 ++--
 drivers/net/defxx.c                         |    4 ++--
 drivers/net/depca.c                         |    4 ++--
 drivers/net/dl2k.c                          |    4 ++--
 drivers/net/dm9000.c                        |    6 +++---
 drivers/net/e100.c                          |    4 ++--
 drivers/net/e1000/e1000_ethtool.c           |    2 +-
 drivers/net/e1000/e1000_main.c              |   10 +++++-----
 drivers/net/e1000e/ethtool.c                |    2 +-
 drivers/net/eepro.c                         |    4 ++--
 drivers/net/eepro100.c                      |    6 +++---
 drivers/net/ehea/ehea_main.c                |    6 +++---
 drivers/net/epic100.c                       |    4 ++--
 drivers/net/eth16i.c                        |    4 ++--
 drivers/net/ewrk3.c                         |    4 ++--
 drivers/net/fealnx.c                        |    4 ++--
 drivers/net/fec.c                           |    8 ++++----
 drivers/net/fec_8xx/fec_main.c              |    4 ++--
 drivers/net/fs_enet/fs_enet-main.c          |    2 +-
 drivers/net/gianfar.c                       |   14 +++++++-------
 drivers/net/gianfar.h                       |    2 +-
 drivers/net/hamachi.c                       |    4 ++--
 drivers/net/hamradio/baycom_ser_fdx.c       |    2 +-
 drivers/net/hamradio/baycom_ser_hdx.c       |    2 +-
 drivers/net/hamradio/dmascc.c               |    4 ++--
 drivers/net/hamradio/yam.c                  |    2 +-
 drivers/net/hp100.c                         |    4 ++--
 drivers/net/ibm_emac/ibm_emac_core.c        |    4 ++--
 drivers/net/ibm_emac/ibm_emac_mal.c         |   10 +++++-----
 drivers/net/ibmlana.c                       |    2 +-
 drivers/net/ibmveth.c                       |    4 ++--
 drivers/net/ioc3-eth.c                      |    2 +-
 drivers/net/ipg.c                           |    2 +-
 drivers/net/irda/ali-ircc.c                 |    2 +-
 drivers/net/irda/donauboe.c                 |    4 ++--
 drivers/net/irda/irport.c                   |    4 ++--
 drivers/net/irda/irport.h                   |    2 +-
 drivers/net/irda/nsc-ircc.c                 |    2 +-
 drivers/net/irda/pxaficp_ir.c               |    4 ++--
 drivers/net/irda/sa1100_ir.c                |    2 +-
 drivers/net/irda/vlsi_ir.c                  |    2 +-
 drivers/net/irda/w83977af_ir.c              |    2 +-
 drivers/net/isa-skeleton.c                  |    4 ++--
 drivers/net/ixgb/ixgb_main.c                |    6 +++---
 drivers/net/ixgbe/ixgbe_main.c              |   12 ++++++------
 drivers/net/ixp2000/ixpdev.c                |    4 ++--
 drivers/net/lance.c                         |    4 ++--
 drivers/net/lguest_net.c                    |    2 +-
 drivers/net/lib8390.c                       |    4 ++--
 drivers/net/lp486e.c                        |    4 ++--
 drivers/net/mac89x0.c                       |    4 ++--
 drivers/net/mace.c                          |   12 ++++++------
 drivers/net/macmace.c                       |    8 ++++----
 drivers/net/meth.c                          |    4 ++--
 drivers/net/mipsnet.c                       |    2 +-
 drivers/net/mlx4/eq.c                       |    4 ++--
 drivers/net/mv643xx_eth.c                   |    4 ++--
 drivers/net/myri10ge/myri10ge.c             |    2 +-
 drivers/net/myri_sbus.c                     |    2 +-
 drivers/net/natsemi.c                       |    6 +++---
 drivers/net/netx-eth.c                      |    2 +-
 drivers/net/ni5010.c                        |    4 ++--
 drivers/net/ni52.c                          |    4 ++--
 drivers/net/ni65.c                          |    4 ++--
 drivers/net/niu.c                           |    2 +-
 drivers/net/ns83820.c                       |    2 +-
 drivers/net/pci-skeleton.c                  |    4 ++--
 drivers/net/pcmcia/3c574_cs.c               |    6 +++---
 drivers/net/pcmcia/3c589_cs.c               |    6 +++---
 drivers/net/pcmcia/axnet_cs.c               |   12 ++++++------
 drivers/net/pcmcia/nmclan_cs.c              |    4 ++--
 drivers/net/pcmcia/pcnet_cs.c               |    8 ++++----
 drivers/net/pcmcia/smc91c92_cs.c            |    6 +++---
 drivers/net/pcmcia/xirc2ps_cs.c             |    4 ++--
 drivers/net/pcnet32.c                       |    6 +++---
 drivers/net/qla3xxx.c                       |    2 +-
 drivers/net/r8169.c                         |    6 +++---
 drivers/net/rrunner.c                       |    2 +-
 drivers/net/rrunner.h                       |    2 +-
 drivers/net/s2io.c                          |    8 ++++----
 drivers/net/s2io.h                          |    6 +++---
 drivers/net/saa9730.c                       |    2 +-
 drivers/net/sb1000.c                        |    4 ++--
 drivers/net/sb1250-mac.c                    |    4 ++--
 drivers/net/sc92031.c                       |    4 ++--
 drivers/net/seeq8005.c                      |    4 ++--
 drivers/net/sgiseeq.c                       |    2 +-
 drivers/net/sis190.c                        |    4 ++--
 drivers/net/sis900.c                        |    6 +++---
 drivers/net/sk98lin/skge.c                  |   10 +++++-----
 drivers/net/skfp/skfddi.c                   |    4 ++--
 drivers/net/skge.c                          |    4 ++--
 drivers/net/sky2.c                          |    4 ++--
 drivers/net/smc-ultra.c                     |    2 +-
 drivers/net/smc911x.c                       |    4 ++--
 drivers/net/smc9194.c                       |    4 ++--
 drivers/net/smc91x.c                        |    4 ++--
 drivers/net/sonic.c                         |    2 +-
 drivers/net/sonic.h                         |    2 +-
 drivers/net/spider_net.c                    |    4 ++--
 drivers/net/starfire.c                      |    4 ++--
 drivers/net/sun3_82586.c                    |    4 ++--
 drivers/net/sun3lance.c                     |    4 ++--
 drivers/net/sunbmac.c                       |    2 +-
 drivers/net/sundance.c                      |    4 ++--
 drivers/net/sungem.c                        |    4 ++--
 drivers/net/sunhme.c                        |    2 +-
 drivers/net/sunlance.c                      |    2 +-
 drivers/net/sunqe.c                         |    2 +-
 drivers/net/tc35815.c                       |    4 ++--
 drivers/net/tehuti.c                        |    2 +-
 drivers/net/tg3.c                           |   14 ++++++--------
 drivers/net/tlan.c                          |    6 +++---
 drivers/net/tokenring/3c359.c               |    4 ++--
 drivers/net/tokenring/ibmtr.c               |    4 ++--
 drivers/net/tokenring/lanstreamer.c         |    4 ++--
 drivers/net/tokenring/madgemc.c             |    6 +++---
 drivers/net/tokenring/olympic.c             |    4 ++--
 drivers/net/tokenring/smctr.c               |    4 ++--
 drivers/net/tokenring/tms380tr.c            |    2 +-
 drivers/net/tokenring/tms380tr.h            |    2 +-
 drivers/net/tulip/de2104x.c                 |    2 +-
 drivers/net/tulip/de4x5.c                   |    4 ++--
 drivers/net/tulip/dmfe.c                    |    6 +++---
 drivers/net/tulip/interrupt.c               |    2 +-
 drivers/net/tulip/tulip.h                   |    2 +-
 drivers/net/tulip/tulip_core.c              |    2 +-
 drivers/net/tulip/uli526x.c                 |    4 ++--
 drivers/net/tulip/winbond-840.c             |    4 ++--
 drivers/net/tulip/xircom_cb.c               |    6 +++---
 drivers/net/tulip/xircom_tulip_cb.c         |    4 ++--
 drivers/net/typhoon.c                       |    2 +-
 drivers/net/via-rhine.c                     |    6 +++---
 drivers/net/via-velocity.c                  |    4 ++--
 drivers/net/wan/cosa.c                      |    4 ++--
 drivers/net/wan/cycx_main.c                 |    4 ++--
 drivers/net/wan/dscc4.c                     |    4 ++--
 drivers/net/wan/farsync.c                   |    2 +-
 drivers/net/wan/hd6457x.c                   |    2 +-
 drivers/net/wan/lmc/lmc_main.c              |    4 ++--
 drivers/net/wan/pc300_drv.c                 |    4 ++--
 drivers/net/wan/sbni.c                      |    4 ++--
 drivers/net/wan/wanxl.c                     |    2 +-
 drivers/net/wan/z85230.c                    |    2 +-
 drivers/net/wan/z85230.h                    |    2 +-
 drivers/net/wireless/adm8211.c              |    2 +-
 drivers/net/wireless/airo.c                 |    4 ++--
 drivers/net/wireless/arlan-main.c           |    4 ++--
 drivers/net/wireless/atmel.c                |    2 +-
 drivers/net/wireless/b43/main.c             |    2 +-
 drivers/net/wireless/b43legacy/main.c       |    2 +-
 drivers/net/wireless/bcm43xx/bcm43xx_main.c |    4 ++--
 drivers/net/wireless/hostap/hostap_hw.c     |    2 +-
 drivers/net/wireless/ipw2100.c              |    2 +-
 drivers/net/wireless/ipw2200.c              |    2 +-
 drivers/net/wireless/iwlwifi/iwl3945-base.c |    2 +-
 drivers/net/wireless/iwlwifi/iwl4965-base.c |    2 +-
 drivers/net/wireless/libertas/if_cs.c       |    4 ++--
 drivers/net/wireless/netwave_cs.c           |    4 ++--
 drivers/net/wireless/orinoco.c              |    2 +-
 drivers/net/wireless/orinoco.h              |    2 +-
 drivers/net/wireless/p54pci.c               |    4 ++--
 drivers/net/wireless/prism54/islpci_dev.c   |    2 +-
 drivers/net/wireless/prism54/islpci_dev.h   |    2 +-
 drivers/net/wireless/ray_cs.c               |    4 ++--
 drivers/net/wireless/rt2x00/rt2400pci.c     |    2 +-
 drivers/net/wireless/rt2x00/rt2500pci.c     |    2 +-
 drivers/net/wireless/rt2x00/rt61pci.c       |    2 +-
 drivers/net/wireless/wavelan.c              |    2 +-
 drivers/net/wireless/wavelan.p.h            |    3 +--
 drivers/net/wireless/wavelan_cs.c           |    3 +--
 drivers/net/wireless/wavelan_cs.p.h         |    3 +--
 drivers/net/wireless/wl3501_cs.c            |    3 +--
 drivers/net/xen-netfront.c                  |    2 +-
 drivers/net/yellowfin.c                     |    4 ++--
 drivers/net/znet.c                          |    4 ++--
 224 files changed, 444 insertions(+), 451 deletions(-)

93e93ce573545b3702477088cba8650b565fd60e
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index be71868..e4aeca5 100644
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -491,7 +491,6 @@ static int el_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 /**
  * el_interrupt:
- * @irq: Interrupt number
  * @dev_id: The 3c501 that burped
  *
  * Handle the ether interface interrupts. The 3c501 needs a lot more
@@ -511,7 +510,7 @@ static int el_start_xmit(struct sk_buff *skb, struct net_device *dev)
  * TCP window.
  */
 
-static irqreturn_t el_interrupt(int irq, void *dev_id)
+static irqreturn_t el_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct net_local *lp;
diff --git a/drivers/net/3c501.h b/drivers/net/3c501.h
index cfec64e..a0e874a 100644
--- a/drivers/net/3c501.h
+++ b/drivers/net/3c501.h
@@ -7,7 +7,7 @@ static int  el1_probe1(struct net_device *dev, int ioaddr);
 static int  el_open(struct net_device *dev);
 static void el_timeout(struct net_device *dev);
 static int  el_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t el_interrupt(int irq, void *dev_id);
+static irqreturn_t el_interrupt(void *dev_id);
 static void el_receive(struct net_device *dev);
 static void el_reset(struct net_device *dev);
 static int  el1_close(struct net_device *dev);
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index 9c65734..d988da0 100644
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -633,7 +633,7 @@ static void receive_packet(struct net_device *dev, int len)
  *
  ******************************************************/
 
-static irqreturn_t elp_interrupt(int irq, void *dev_id)
+static irqreturn_t elp_interrupt(void *dev_id)
 {
 	int len;
 	int dlen;
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index 964d31a..2a5579a 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -285,7 +285,7 @@ static unsigned short init_words[] = {
 static int	el16_probe1(struct net_device *dev, int ioaddr);
 static int	el16_open(struct net_device *dev);
 static int	el16_send_packet(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t el16_interrupt(int irq, void *dev_id);
+static irqreturn_t el16_interrupt(void *dev_id);
 static void el16_rx(struct net_device *dev);
 static int	el16_close(struct net_device *dev);
 static void el16_tx_timeout (struct net_device *dev);
@@ -538,7 +538,7 @@ static int el16_send_packet (struct sk_buff *skb, struct net_device *dev)
 
 /*	The typical workload of the driver:
 	Handle the network interface interrupts. */
-static irqreturn_t el16_interrupt(int irq, void *dev_id)
+static irqreturn_t el16_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct net_local *lp;
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index edda6e1..259a594 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -189,7 +189,7 @@ static ushort id_read_eeprom(int index);
 static ushort read_eeprom(int ioaddr, int index);
 static int el3_open(struct net_device *dev);
 static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t el3_interrupt(int irq, void *dev_id);
+static irqreturn_t el3_interrupt(void *dev_id);
 static void update_stats(struct net_device *dev);
 static struct net_device_stats *el3_get_stats(struct net_device *dev);
 static int el3_rx(struct net_device *dev);
@@ -896,7 +896,7 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 /* The EL3 interrupt handler. */
 static irqreturn_t
-el3_interrupt(int irq, void *dev_id)
+el3_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct el3_private *lp;
@@ -987,7 +987,7 @@ el3_interrupt(int irq, void *dev_id)
 static void el3_poll_controller(struct net_device *dev)
 {
 	disable_irq(dev->irq);
-	el3_interrupt(dev->irq, dev);
+	el3_interrupt(dev);
 	enable_irq(dev->irq);
 }
 #endif
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 275e751..19c0232 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -373,7 +373,7 @@ static int corkscrew_start_xmit(struct sk_buff *skb,
 static int corkscrew_rx(struct net_device *dev);
 static void corkscrew_timeout(struct net_device *dev);
 static int boomerang_rx(struct net_device *dev);
-static irqreturn_t corkscrew_interrupt(int irq, void *dev_id);
+static irqreturn_t corkscrew_interrupt(void *dev_id);
 static int corkscrew_close(struct net_device *dev);
 static void update_stats(int addr, struct net_device *dev);
 static struct net_device_stats *corkscrew_get_stats(struct net_device *dev);
@@ -1113,7 +1113,7 @@ static int corkscrew_start_xmit(struct sk_buff *skb,
 /* The interrupt handler does all of the Rx thread work and cleans up
    after the Tx thread. */
 
-static irqreturn_t corkscrew_interrupt(int irq, void *dev_id)
+static irqreturn_t corkscrew_interrupt(void *dev_id)
 {
 	/* Use the now-standard shared IRQ implementation. */
 	struct net_device *dev = dev_id;
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index 239fc42..80768bb 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -180,7 +180,7 @@ sizeof(nop_cmd) = 8;
       	dev->name,__LINE__); \
       elmc_id_reset586(); } } }
 
-static irqreturn_t elmc_interrupt(int irq, void *dev_id);
+static irqreturn_t elmc_interrupt(void *dev_id);
 static int elmc_open(struct net_device *dev);
 static int elmc_close(struct net_device *dev);
 static int elmc_send_packet(struct sk_buff *, struct net_device *);
@@ -895,7 +895,7 @@ static void *alloc_rfa(struct net_device *dev, void *ptr)
  */
 
 static irqreturn_t
-elmc_interrupt(int irq, void *dev_id)
+elmc_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	unsigned short stat;
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index b72b89d..22c57ac 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -217,7 +217,7 @@ static int      mc32_command(struct net_device *dev, u16 cmd, void *data, int le
 static int	mc32_open(struct net_device *dev);
 static void	mc32_timeout(struct net_device *dev);
 static int	mc32_send_packet(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t mc32_interrupt(int irq, void *dev_id);
+static irqreturn_t mc32_interrupt(void *dev_id);
 static int	mc32_close(struct net_device *dev);
 static struct	net_device_stats *mc32_get_stats(struct net_device *dev);
 static void	mc32_set_multicast_list(struct net_device *dev);
@@ -1314,7 +1314,7 @@ static void mc32_tx_ring(struct net_device *dev)
  *
  */
 
-static irqreturn_t mc32_interrupt(int irq, void *dev_id)
+static irqreturn_t mc32_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct mc32_local *lp;
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 862f472..dd6ae9d 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -717,8 +717,8 @@ static int vortex_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static int boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static int vortex_rx(struct net_device *dev);
 static int boomerang_rx(struct net_device *dev);
-static irqreturn_t vortex_interrupt(int irq, void *dev_id);
-static irqreturn_t boomerang_interrupt(int irq, void *dev_id);
+static irqreturn_t vortex_interrupt(void *dev_id);
+static irqreturn_t boomerang_interrupt(void *dev_id);
 static int vortex_close(struct net_device *dev);
 static void dump_tx_ring(struct net_device *dev);
 static void update_stats(void __iomem *ioaddr, struct net_device *dev);
@@ -793,7 +793,7 @@ static void poll_vortex(struct net_device *dev)
 	struct vortex_private *vp = netdev_priv(dev);
 	unsigned long flags;
 	local_irq_save(flags);
-	(vp->full_bus_master_rx ? boomerang_interrupt:vortex_interrupt)(dev->irq,dev);
+	(vp->full_bus_master_rx ? boomerang_interrupt:vortex_interrupt)(dev);
 	local_irq_restore(flags);
 }
 #endif
@@ -1863,9 +1863,9 @@ static void vortex_tx_timeout(struct net_device *dev)
 			unsigned long flags;
 			local_irq_save(flags);
 			if (vp->full_bus_master_tx)
-				boomerang_interrupt(dev->irq, dev);
+				boomerang_interrupt(dev);
 			else
-				vortex_interrupt(dev->irq, dev);
+				vortex_interrupt(dev);
 			local_irq_restore(flags);
 		}
 	}
@@ -2163,7 +2163,7 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
  */
 
 static irqreturn_t
-vortex_interrupt(int irq, void *dev_id)
+vortex_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct vortex_private *vp = netdev_priv(dev);
@@ -2268,7 +2268,7 @@ handler_exit:
  */
 
 static irqreturn_t
-boomerang_interrupt(int irq, void *dev_id)
+boomerang_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct vortex_private *vp = netdev_priv(dev);
diff --git a/drivers/net/7990.c b/drivers/net/7990.c
index 224e0bf..0940a0c 100644
--- a/drivers/net/7990.c
+++ b/drivers/net/7990.c
@@ -437,7 +437,7 @@ static int lance_tx (struct net_device *dev)
 }
 
 static irqreturn_t
-lance_interrupt (int irq, void *dev_id)
+lance_interrupt (void *dev_id)
 {
         struct net_device *dev = (struct net_device *)dev_id;
         struct lance_private *lp = netdev_priv(dev);
@@ -666,7 +666,7 @@ void lance_poll(struct net_device *dev)
 	WRITERAP(lp, LE_CSR0);
 	WRITERDP(lp, LE_C0_STRT);
 	spin_unlock (&lp->devlock);
-	lance_interrupt(dev->irq, dev);
+	lance_interrupt(dev);
 }
 #endif
 
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index a453eda..b8d3b1f 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -614,7 +614,7 @@ rx_next:
 	return rx;
 }
 
-static irqreturn_t cp_interrupt (int irq, void *dev_instance)
+static irqreturn_t cp_interrupt (void *dev_instance)
 {
 	struct net_device *dev = dev_instance;
 	struct cp_private *cp;
@@ -678,7 +678,7 @@ static irqreturn_t cp_interrupt (int irq, void *dev_instance)
 static void cp_poll_controller(struct net_device *dev)
 {
 	disable_irq(dev->irq);
-	cp_interrupt(dev->irq, dev);
+	cp_interrupt(dev);
 	enable_irq(dev->irq);
 }
 #endif
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 973b684..26a2ba3 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -638,7 +638,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb,
 static void rtl8139_poll_controller(struct net_device *dev);
 #endif
 static int rtl8139_poll(struct napi_struct *napi, int budget);
-static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance);
+static irqreturn_t rtl8139_interrupt (void *dev_instance);
 static int rtl8139_close (struct net_device *dev);
 static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd);
 static struct net_device_stats *rtl8139_get_stats (struct net_device *dev);
@@ -2128,7 +2128,7 @@ static int rtl8139_poll(struct napi_struct *napi, int budget)
 
 /* The interrupt handler does all of the Rx thread work and cleans up
    after the Tx thread. */
-static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance)
+static irqreturn_t rtl8139_interrupt (void *dev_instance)
 {
 	struct net_device *dev = (struct net_device *) dev_instance;
 	struct rtl8139_private *tp = netdev_priv(dev);
@@ -2200,7 +2200,7 @@ static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance)
 static void rtl8139_poll_controller(struct net_device *dev)
 {
 	disable_irq(dev->irq);
-	rtl8139_interrupt(dev->irq, dev);
+	rtl8139_interrupt(dev);
 	enable_irq(dev->irq);
 }
 #endif
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index bb30d5b..61d2598 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -357,7 +357,7 @@ static char init_setup[] =
 
 static int i596_open(struct net_device *dev);
 static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t i596_interrupt(int irq, void *dev_id);
+static irqreturn_t i596_interrupt(void *dev_id);
 static int i596_close(struct net_device *dev);
 static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd);
 static void i596_tx_timeout (struct net_device *dev);
@@ -500,7 +500,7 @@ static void i596_display_data(struct net_device *dev)
 
 
 #if defined(ENABLE_MVME16x_NET) || defined(ENABLE_BVME6000_NET)
-static irqreturn_t i596_error(int irq, void *dev_id)
+static irqreturn_t i596_error(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 #ifdef ENABLE_MVME16x_NET
@@ -1277,7 +1277,7 @@ out:
 	return ERR_PTR(err);
 }
 
-static irqreturn_t i596_interrupt(int irq, void *dev_id)
+static irqreturn_t i596_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct i596_private *lp;
diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index a828076..f2e6405 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -15,9 +15,9 @@ int ei_close(struct net_device *dev)
 	return __ei_close(dev);
 }
 
-irqreturn_t ei_interrupt(int irq, void *dev_id)
+irqreturn_t ei_interrupt(void *dev_id)
 {
-	return __ei_interrupt(irq, dev_id);
+	return __ei_interrupt(dev_id);
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
diff --git a/drivers/net/8390.h b/drivers/net/8390.h
index 04ddec0..afff8ad 100644
--- a/drivers/net/8390.h
+++ b/drivers/net/8390.h
@@ -35,7 +35,7 @@ extern void ei_poll(struct net_device *dev);
 extern void NS8390_init(struct net_device *dev, int startp);
 extern int ei_open(struct net_device *dev);
 extern int ei_close(struct net_device *dev);
-extern irqreturn_t ei_interrupt(int irq, void *dev_id);
+extern irqreturn_t ei_interrupt(void *dev_id);
 extern struct net_device *__alloc_ei_netdev(int size);
 static inline struct net_device *alloc_ei_netdev(void)
 {
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index 18f7f81..c4d04db 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -423,7 +423,7 @@ static int lance_tx (struct net_device *dev)
 	return 0;
 }
 
-static irqreturn_t lance_interrupt (int irq, void *dev_id)
+static irqreturn_t lance_interrupt (void *dev_id)
 {
 	struct net_device *dev;
 	struct lance_private *lp;
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 6c19265..7ace7cd 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -2135,7 +2135,7 @@ static inline void ace_tx_int(struct net_device *dev,
 }
 
 
-static irqreturn_t ace_interrupt(int irq, void *dev_id)
+static irqreturn_t ace_interrupt(void *dev_id)
 {
 	struct net_device *dev = (struct net_device *)dev_id;
 	struct ace_private *ap = netdev_priv(dev);
diff --git a/drivers/net/acenic.h b/drivers/net/acenic.h
index 60ed183..de6c5c3 100644
--- a/drivers/net/acenic.h
+++ b/drivers/net/acenic.h
@@ -769,7 +769,7 @@ static int ace_init(struct net_device *dev);
 static void ace_load_std_rx_ring(struct ace_private *ap, int nr_bufs);
 static void ace_load_mini_rx_ring(struct ace_private *ap, int nr_bufs);
 static void ace_load_jumbo_rx_ring(struct ace_private *ap, int nr_bufs);
-static irqreturn_t ace_interrupt(int irq, void *dev_id);
+static irqreturn_t ace_interrupt(void *dev_id);
 static int ace_load_firmware(struct net_device *dev);
 static int ace_open(struct net_device *dev);
 static int ace_start_xmit(struct sk_buff *skb, struct net_device *dev);
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index 1cc74ec..ca133d6 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1248,7 +1248,7 @@ static int amd8111e_calc_coalesce(struct net_device *dev)
 /*
 This is device interrupt function. It handles transmit, receive,link change and hardware timer interrupts.
 */
-static irqreturn_t amd8111e_interrupt(int irq, void *dev_id)
+static irqreturn_t amd8111e_interrupt(void *dev_id)
 {
 
 	struct net_device * dev = (struct net_device *) dev_id;
@@ -1326,7 +1326,7 @@ static void amd8111e_poll(struct net_device *dev)
 {
 	unsigned long flags;
 	local_irq_save(flags);
-	amd8111e_interrupt(0, dev);
+	amd8111e_interrupt(dev);
 	local_irq_restore(flags);
 }
 #endif
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index c12cbdf..ad3a084 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -88,7 +88,7 @@ static void apne_block_input(struct net_device *dev, int count,
 								struct sk_buff *skb, int ring_offset);
 static void apne_block_output(struct net_device *dev, const int count,
 							const unsigned char *buf, const int start_page);
-static irqreturn_t apne_interrupt(int irq, void *dev_id);
+static irqreturn_t apne_interrupt(void *dev_id);
 
 static int init_pcmcia(void);
 
@@ -544,7 +544,7 @@ apne_block_output(struct net_device *dev, int count,
     return;
 }
 
-static irqreturn_t apne_interrupt(int irq, void *dev_id)
+static irqreturn_t apne_interrupt(void *dev_id)
 {
     unsigned char pcmcia_intreq;
 
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 92c3a4c..f7839cd 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -188,7 +188,7 @@ static void cops_reset (struct net_device *dev, int sleep);
 static void cops_load (struct net_device *dev);
 static int  cops_nodeid (struct net_device *dev, int nodeid);
 
-static irqreturn_t cops_interrupt (int irq, void *dev_id);
+static irqreturn_t cops_interrupt (void *dev_id);
 static void cops_poll (unsigned long ltdev);
 static void cops_timeout(struct net_device *dev);
 static void cops_rx (struct net_device *dev);
@@ -714,7 +714,7 @@ static void cops_poll(unsigned long ltdev)
  *      The typical workload of the driver:
  *      Handle the network interface interrupts.
  */
-static irqreturn_t cops_interrupt(int irq, void *dev_id)
+static irqreturn_t cops_interrupt(void *dev_id)
 {
         struct net_device *dev = dev_id;
         struct cops_local *lp;
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 6ab2c2d..f45ed88 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -790,7 +790,7 @@ static int sendup_buffer (struct net_device *dev)
 /* the handler for the board interrupt */
  
 static irqreturn_t
-ltpc_interrupt(int irq, void *dev_id)
+ltpc_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index c59c806..f6b35cc 100644
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -761,7 +761,7 @@ static void arcnet_timeout(struct net_device *dev)
  * interrupts. Establish which device needs attention, and call the correct
  * chipset interrupt handler.
  */
-irqreturn_t arcnet_interrupt(int irq, void *dev_id)
+irqreturn_t arcnet_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct arcnet_local *lp;
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 3fa3bcc..8cfacec 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -120,7 +120,7 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static void ariadne_tx_timeout(struct net_device *dev);
 static int ariadne_rx(struct net_device *dev);
 static void ariadne_reset(struct net_device *dev);
-static irqreturn_t ariadne_interrupt(int irq, void *data);
+static irqreturn_t ariadne_interrupt(void *data);
 static int ariadne_close(struct net_device *dev);
 static struct net_device_stats *ariadne_get_stats(struct net_device *dev);
 #ifdef HAVE_MULTICAST
@@ -415,7 +415,7 @@ static inline void ariadne_reset(struct net_device *dev)
 }
 
 
-static irqreturn_t ariadne_interrupt(int irq, void *data)
+static irqreturn_t ariadne_interrupt(void *data)
 {
     struct net_device *dev = (struct net_device *)data;
     volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr;
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index ba6bd03..98522b7 100644
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -38,7 +38,7 @@
 #include "am79c961a.h"
 
 static irqreturn_t
-am79c961_interrupt (int irq, void *dev_id);
+am79c961_interrupt (void *dev_id);
 
 static unsigned int net_debug = NET_DEBUG;
 
@@ -595,7 +595,7 @@ am79c961_tx(struct net_device *dev, struct dev_priv *priv)
 }
 
 static irqreturn_t
-am79c961_interrupt(int irq, void *dev_id)
+am79c961_interrupt(void *dev_id)
 {
 	struct net_device *dev = (struct net_device *)dev_id;
 	struct dev_priv *priv = netdev_priv(dev);
@@ -634,7 +634,7 @@ static void am79c961_poll_controller(struct net_device *dev)
 {
 	unsigned long flags;
 	local_irq_save(flags);
-	am79c961_interrupt(dev->irq, dev);
+	am79c961_interrupt(dev);
 	local_irq_restore(flags);
 }
 #endif
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index 25b114a..15d06bf 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -193,7 +193,7 @@ static void update_linkspeed(struct net_device *dev, int silent)
 /*
  * Handle interrupts from the PHY
  */
-static irqreturn_t at91ether_phy_interrupt(int irq, void *dev_id)
+static irqreturn_t at91ether_phy_interrupt(void *dev_id)
 {
 	struct net_device *dev = (struct net_device *) dev_id;
 	struct at91_private *lp = netdev_priv(dev);
@@ -918,7 +918,7 @@ static void at91ether_rx(struct net_device *dev)
 /*
  * MAC interrupt handler
  */
-static irqreturn_t at91ether_interrupt(int irq, void *dev_id)
+static irqreturn_t at91ether_interrupt(void *dev_id)
 {
 	struct net_device *dev = (struct net_device *) dev_id;
 	struct at91_private *lp = netdev_priv(dev);
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c
index 7f016f3..997347e 100644
--- a/drivers/net/arm/ep93xx_eth.c
+++ b/drivers/net/arm/ep93xx_eth.c
@@ -405,7 +405,7 @@ static void ep93xx_tx_complete(struct net_device *dev)
 		netif_wake_queue(dev);
 }
 
-static irqreturn_t ep93xx_irq(int irq, void *dev_id)
+static irqreturn_t ep93xx_irq(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct ep93xx_priv *ep = netdev_priv(dev);
diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c
index 3bb9e29..1f1fd1c 100644
--- a/drivers/net/arm/ether1.c
+++ b/drivers/net/arm/ether1.c
@@ -66,7 +66,7 @@ static unsigned int net_debug = NET_DEBUG;
 
 static int ether1_open(struct net_device *dev);
 static int ether1_sendpacket(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t ether1_interrupt(int irq, void *dev_id);
+static irqreturn_t ether1_interrupt(void *dev_id);
 static int ether1_close(struct net_device *dev);
 static struct net_device_stats *ether1_getstats(struct net_device *dev);
 static void ether1_setmulticastlist(struct net_device *dev);
@@ -905,7 +905,7 @@ ether1_recv_done (struct net_device *dev)
 }
 
 static irqreturn_t
-ether1_interrupt (int irq, void *dev_id)
+ether1_interrupt (void *dev_id)
 {
 	struct net_device *dev = (struct net_device *)dev_id;
 	int status;
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index 67e96ae..7cd39e2 100644
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -79,7 +79,7 @@ static int	ether3_rx(struct net_device *dev, unsigned int maxcnt);
 static void	ether3_tx(struct net_device *dev);
 static int	ether3_open (struct net_device *dev);
 static int	ether3_sendpacket (struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t ether3_interrupt (int irq, void *dev_id);
+static irqreturn_t ether3_interrupt (void *dev_id);
 static int	ether3_close (struct net_device *dev);
 static struct net_device_stats *ether3_getstats (struct net_device *dev);
 static void	ether3_setmulticastlist (struct net_device *dev);
@@ -566,7 +566,7 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev)
 }
 
 static irqreturn_t
-ether3_interrupt(int irq, void *dev_id)
+ether3_interrupt(void *dev_id)
 {
 	struct net_device *dev = (struct net_device *)dev_id;
 	unsigned int status, handled = IRQ_NONE;
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index b032c1b..af41130 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -160,7 +160,7 @@ static int at1700_probe1(struct net_device *dev, int ioaddr);
 static int read_eeprom(long ioaddr, int location);
 static int net_open(struct net_device *dev);
 static int	net_send_packet(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t net_interrupt(int irq, void *dev_id);
+static irqreturn_t net_interrupt(void *dev_id);
 static void net_rx(struct net_device *dev);
 static int net_close(struct net_device *dev);
 static void set_rx_mode(struct net_device *dev);
@@ -643,7 +643,7 @@ static int net_send_packet (struct sk_buff *skb, struct net_device *dev)
 
 /* The typical workload of the driver:
    Handle the network interface interrupts. */
-static irqreturn_t net_interrupt(int irq, void *dev_id)
+static irqreturn_t net_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct net_local *lp;
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index b74dbee..f02556a 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -343,7 +343,7 @@ static unsigned long lance_probe1( struct net_device *dev, struct lance_addr
 static int lance_open( struct net_device *dev );
 static void lance_init_ring( struct net_device *dev );
 static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev );
-static irqreturn_t lance_interrupt( int irq, void *dev_id );
+static irqreturn_t lance_interrupt( void *dev_id );
 static int lance_rx( struct net_device *dev );
 static int lance_close( struct net_device *dev );
 static void set_multicast_list( struct net_device *dev );
@@ -853,7 +853,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
 
 /* The LANCE interrupt handler. */
 
-static irqreturn_t lance_interrupt( int irq, void *dev_id )
+static irqreturn_t lance_interrupt( void *dev_id )
 {
 	struct net_device *dev = dev_id;
 	struct lance_private *lp;
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
index 35b0a7d..30c5366 100644
--- a/drivers/net/atl1/atl1_main.c
+++ b/drivers/net/atl1/atl1_main.c
@@ -1761,7 +1761,7 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
  * @data: pointer to a network interface device structure
  * @pt_regs: CPU registers structure
  */
-static irqreturn_t atl1_intr(int irq, void *data)
+static irqreturn_t atl1_intr(void *data)
 {
 	struct atl1_adapter *adapter = netdev_priv(data);
 	u32 status;
@@ -2181,7 +2181,7 @@ static int atl1_resume(struct pci_dev *pdev)
 static void atl1_poll_controller(struct net_device *netdev)
 {
 	disable_irq(netdev->irq);
-	atl1_intr(netdev->irq, netdev);
+	atl1_intr(netdev);
 	enable_irq(netdev->irq);
 }
 #endif
diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index 62f09e5..dcf5c4b 100644
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -200,7 +200,7 @@ static void hardware_init(struct net_device *dev);
 static void write_packet(long ioaddr, int length, unsigned char *packet, int pad, int mode);
 static void trigger_send(long ioaddr, int length);
 static int	atp_send_packet(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t atp_interrupt(int irq, void *dev_id);
+static irqreturn_t atp_interrupt(void *dev_id);
 static void net_rx(struct net_device *dev);
 static void read_block(long ioaddr, int length, unsigned char *buffer, int data_mode);
 static int net_close(struct net_device *dev);
@@ -589,7 +589,7 @@ static int atp_send_packet(struct sk_buff *skb, struct net_device *dev)
 
 /* The typical workload of the driver:
    Handle the network interface interrupts. */
-static irqreturn_t atp_interrupt(int irq, void *dev_instance)
+static irqreturn_t atp_interrupt(void *dev_instance)
 {
 	struct net_device *dev = dev_instance;
 	struct net_local *lp;
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 185f98e..0c703cf 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -90,7 +90,7 @@ static int au1000_open(struct net_device *);
 static int au1000_close(struct net_device *);
 static int au1000_tx(struct sk_buff *, struct net_device *);
 static int au1000_rx(struct net_device *);
-static irqreturn_t au1000_interrupt(int, void *);
+static irqreturn_t au1000_interrupt(void *);
 static void au1000_tx_timeout(struct net_device *);
 static void set_rx_mode(struct net_device *);
 static int au1000_ioctl(struct net_device *, struct ifreq *, int);
@@ -1237,7 +1237,7 @@ static int au1000_rx(struct net_device *dev)
 /*
  * Au1000 interrupt service routine.
  */
-static irqreturn_t au1000_interrupt(int irq, void *dev_id)
+static irqreturn_t au1000_interrupt(void *dev_id)
 {
 	struct net_device *dev = (struct net_device *) dev_id;
 
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 3d247f3..e8fe653 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -881,7 +881,7 @@ static int b44_poll(struct napi_struct *napi, int budget)
 	return work_done;
 }
 
-static irqreturn_t b44_interrupt(int irq, void *dev_id)
+static irqreturn_t b44_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct b44 *bp = netdev_priv(dev);
@@ -1448,7 +1448,7 @@ out:
 static void b44_poll_controller(struct net_device *dev)
 {
 	disable_irq(dev->irq);
-	b44_interrupt(dev->irq, dev);
+	b44_interrupt(dev);
 	enable_irq(dev->irq);
 }
 #endif
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index a42bd19..908baf8 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -151,9 +151,9 @@ static void bmac_init_chip(struct net_device *dev);
 static void bmac_init_registers(struct net_device *dev);
 static void bmac_enable_and_reset_chip(struct net_device *dev);
 static int bmac_set_address(struct net_device *dev, void *addr);
-static irqreturn_t bmac_misc_intr(int irq, void *dev_id);
-static irqreturn_t bmac_txdma_intr(int irq, void *dev_id);
-static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id);
+static irqreturn_t bmac_misc_intr(void *dev_id);
+static irqreturn_t bmac_txdma_intr(void *dev_id);
+static irqreturn_t bmac_rxdma_intr(void *dev_id);
 static void bmac_set_timeout(struct net_device *dev);
 static void bmac_tx_timeout(unsigned long data);
 static int bmac_output(struct sk_buff *skb, struct net_device *dev);
@@ -675,7 +675,7 @@ static int bmac_transmit_packet(struct sk_buff *skb, struct net_device *dev)
 
 static int rxintcount;
 
-static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id)
+static irqreturn_t bmac_rxdma_intr(void *dev_id)
 {
 	struct net_device *dev = (struct net_device *) dev_id;
 	struct bmac_data *bp = netdev_priv(dev);
@@ -751,7 +751,7 @@ static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id)
 
 static int txintcount;
 
-static irqreturn_t bmac_txdma_intr(int irq, void *dev_id)
+static irqreturn_t bmac_txdma_intr(void *dev_id)
 {
 	struct net_device *dev = (struct net_device *) dev_id;
 	struct bmac_data *bp = netdev_priv(dev);
@@ -1061,7 +1061,7 @@ static void bmac_set_multicast(struct net_device *dev)
 
 static int miscintcount;
 
-static irqreturn_t bmac_misc_intr(int irq, void *dev_id)
+static irqreturn_t bmac_misc_intr(void *dev_id)
 {
 	struct net_device *dev = (struct net_device *) dev_id;
 	struct bmac_data *bp = netdev_priv(dev);
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 96cee4b..3205cdd 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -2539,7 +2539,7 @@ next_rx:
  * is that the MSI interrupt is always serviced.
  */
 static irqreturn_t
-bnx2_msi(int irq, void *dev_instance)
+bnx2_msi(void *dev_instance)
 {
 	struct net_device *dev = dev_instance;
 	struct bnx2 *bp = netdev_priv(dev);
@@ -2559,7 +2559,7 @@ bnx2_msi(int irq, void *dev_instance)
 }
 
 static irqreturn_t
-bnx2_msi_1shot(int irq, void *dev_instance)
+bnx2_msi_1shot(void *dev_instance)
 {
 	struct net_device *dev = dev_instance;
 	struct bnx2 *bp = netdev_priv(dev);
@@ -2576,7 +2576,7 @@ bnx2_msi_1shot(int irq, void *dev_instance)
 }
 
 static irqreturn_t
-bnx2_interrupt(int irq, void *dev_instance)
+bnx2_interrupt(void *dev_instance)
 {
 	struct net_device *dev = dev_instance;
 	struct bnx2 *bp = netdev_priv(dev);
@@ -6325,7 +6325,7 @@ poll_bnx2(struct net_device *dev)
 	struct bnx2 *bp = netdev_priv(dev);
 
 	disable_irq(bp->pdev->irq);
-	bnx2_interrupt(bp->pdev->irq, dev);
+	bnx2_interrupt(dev);
 	enable_irq(bp->pdev->irq);
 }
 #endif
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 7df31b5..dd7c2a1 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -2468,7 +2468,7 @@ static inline void cas_handle_irqN(struct net_device *dev,
 		cas_post_rxcs_ringN(dev, cp, ring);
 }
 
-static irqreturn_t cas_interruptN(int irq, void *dev_id)
+static irqreturn_t cas_interruptN(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct cas *cp = netdev_priv(dev);
@@ -2521,7 +2521,7 @@ static inline void cas_handle_irq1(struct cas *cp, const u32 status)
 }
 
 /* ring 2 handles a few more events than 3 and 4 */
-static irqreturn_t cas_interrupt1(int irq, void *dev_id)
+static irqreturn_t cas_interrupt1(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct cas *cp = netdev_priv(dev);
@@ -2573,7 +2573,7 @@ static inline void cas_handle_irq(struct net_device *dev,
 		cas_post_rxcs_ringN(dev, cp, 0);
 }
 
-static irqreturn_t cas_interrupt(int irq, void *dev_id)
+static irqreturn_t cas_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct cas *cp = netdev_priv(dev);
@@ -2683,7 +2683,7 @@ static void cas_netpoll(struct net_device *dev)
 	struct cas *cp = netdev_priv(dev);
 
 	cas_disable_irq(cp, 0);
-	cas_interrupt(cp->pdev->irq, dev);
+	cas_interrupt(dev);
 	cas_enable_irq(cp, 0);
 
 #ifdef USE_PCI_INTB
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 2dbf8dc..0384800 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -898,7 +898,7 @@ static void t1_netpoll(struct net_device *dev)
 	struct adapter *adapter = dev->priv;
 
 	local_irq_save(flags);
-	t1_interrupt(adapter->pdev->irq, adapter);
+	t1_interrupt(adapter);
 	local_irq_restore(flags);
 }
 #endif
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index ffa7e64..a3d147f 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -1639,7 +1639,7 @@ int t1_poll(struct napi_struct *napi, int budget)
 /*
  * NAPI version of the main interrupt handler.
  */
-irqreturn_t t1_interrupt(int irq, void *data)
+irqreturn_t t1_interrupt(void *data)
 {
 	struct adapter *adapter = data;
 	struct sge *sge = adapter->sge;
@@ -1688,7 +1688,7 @@ irqreturn_t t1_interrupt(int irq, void *data)
  * 5. If we took an interrupt, but no valid respQ descriptors was found we
  *      let the slow_intr_handler run and do error handling.
  */
-irqreturn_t t1_interrupt(int irq, void *cookie)
+irqreturn_t t1_interrupt(void *cookie)
 {
 	int work_done;
 	struct adapter *adapter = cookie;
diff --git a/drivers/net/chelsio/sge.h b/drivers/net/chelsio/sge.h
index 713d9c5..446de58 100644
--- a/drivers/net/chelsio/sge.h
+++ b/drivers/net/chelsio/sge.h
@@ -76,7 +76,7 @@ struct sge *t1_sge_create(struct adapter *, struct sge_params *);
 int t1_sge_configure(struct sge *, struct sge_params *);
 int t1_sge_set_coalesce_params(struct sge *, struct sge_params *);
 void t1_sge_destroy(struct sge *);
-irqreturn_t t1_interrupt(int irq, void *cookie);
+irqreturn_t t1_interrupt(void *cookie);
 int t1_poll(struct napi_struct *, int);
 
 int t1_start_xmit(struct sk_buff *skb, struct net_device *dev);
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 314b2f6..0af45f9 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -402,8 +402,8 @@ static int etrax_ethernet_init(void);
 static int e100_open(struct net_device *dev);
 static int e100_set_mac_address(struct net_device *dev, void *addr);
 static int e100_send_packet(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t e100rxtx_interrupt(int irq, void *dev_id);
-static irqreturn_t e100nw_interrupt(int irq, void *dev_id);
+static irqreturn_t e100rxtx_interrupt(void *dev_id);
+static irqreturn_t e100nw_interrupt(void *dev_id);
 static void e100_rx(struct net_device *dev);
 static int e100_close(struct net_device *dev);
 static int e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
@@ -1194,7 +1194,7 @@ e100_send_packet(struct sk_buff *skb, struct net_device *dev)
  */
 
 static irqreturn_t
-e100rxtx_interrupt(int irq, void *dev_id)
+e100rxtx_interrupt(void *dev_id)
 {
 	struct net_device *dev = (struct net_device *)dev_id;
 	struct net_local *np = (struct net_local *)dev->priv;
@@ -1261,7 +1261,7 @@ e100rxtx_interrupt(int irq, void *dev_id)
 }
 
 static irqreturn_t
-e100nw_interrupt(int irq, void *dev_id)
+e100nw_interrupt(void *dev_id)
 {
 	struct net_device *dev = (struct net_device *)dev_id;
 	struct net_local *np = (struct net_local *)dev->priv;
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 5717509..5245a91 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -249,7 +249,7 @@ struct net_local {
 static int cs89x0_probe1(struct net_device *dev, int ioaddr, int modular);
 static int net_open(struct net_device *dev);
 static int net_send_packet(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t net_interrupt(int irq, void *dev_id);
+static irqreturn_t net_interrupt(void *dev_id);
 static void set_multicast_list(struct net_device *dev);
 static void net_timeout(struct net_device *dev);
 static void net_rx(struct net_device *dev);
@@ -495,7 +495,7 @@ get_eeprom_cksum(int off, int len, int *buffer)
 static void net_poll_controller(struct net_device *dev)
 {
 	disable_irq(dev->irq);
-	net_interrupt(dev->irq, dev);
+	net_interrupt(dev);
 	enable_irq(dev->irq);
 }
 #endif
@@ -1568,7 +1568,7 @@ static int net_send_packet(struct sk_buff *skb, struct net_device *dev)
 /* The typical workload of the driver:
    Handle the network interface interrupts. */
 
-static irqreturn_t net_interrupt(int irq, void *dev_id)
+static irqreturn_t net_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct net_local *lp;
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 61ffc92..24e3ad8 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -252,7 +252,7 @@ static inline void cxgb_disable_msi(struct adapter *adapter)
 /*
  * Interrupt handler for asynchronous events used with MSI-X.
  */
-static irqreturn_t t3_async_intr_handler(int irq, void *cookie)
+static irqreturn_t t3_async_intr_handler(void *cookie)
 {
 	t3_slow_intr_handler(cookie);
 	return IRQ_HANDLED;
@@ -2150,7 +2150,7 @@ static void cxgb_netpoll(struct net_device *dev)
 		else
 			source = adapter;
 
-		t3_intr_handler(adapter, qs->rspq.polling) (0, source);
+		t3_intr_handler(adapter, qs->rspq.polling) (source);
 	}
 }
 #endif
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index c15e43a..2c510d2 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -2196,7 +2196,7 @@ static inline int handle_responses(struct adapter *adap, struct sge_rspq *q)
  * The MSI-X interrupt handler for an SGE response queue for the non-NAPI case
  * (i.e., response queue serviced in hard interrupt).
  */
-irqreturn_t t3_sge_intr_msix(int irq, void *cookie)
+irqreturn_t t3_sge_intr_msix(void *cookie)
 {
 	struct sge_qset *qs = cookie;
 	struct adapter *adap = qs->adap;
@@ -2215,7 +2215,7 @@ irqreturn_t t3_sge_intr_msix(int irq, void *cookie)
  * The MSI-X interrupt handler for an SGE response queue for the NAPI case
  * (i.e., response queue serviced by NAPI polling).
  */
-static irqreturn_t t3_sge_intr_msix_napi(int irq, void *cookie)
+static irqreturn_t t3_sge_intr_msix_napi(void *cookie)
 {
 	struct sge_qset *qs = cookie;
 	struct sge_rspq *q = &qs->rspq;
@@ -2234,7 +2234,7 @@ static irqreturn_t t3_sge_intr_msix_napi(int irq, void *cookie)
  * the same MSI vector.  We use one SGE response queue per port in this mode
  * and protect all response queues with queue 0's lock.
  */
-static irqreturn_t t3_intr_msi(int irq, void *cookie)
+static irqreturn_t t3_intr_msi(void *cookie)
 {
 	int new_packets = 0;
 	struct adapter *adap = cookie;
@@ -2284,7 +2284,7 @@ static int rspq_check_napi(struct sge_qset *qs)
  * one SGE response queue per port in this mode and protect all response
  * queues with queue 0's lock.
  */
-static irqreturn_t t3_intr_msi_napi(int irq, void *cookie)
+static irqreturn_t t3_intr_msi_napi(void *cookie)
 {
 	int new_packets;
 	struct adapter *adap = cookie;
@@ -2322,7 +2322,7 @@ static inline int process_responses_gts(struct adapter *adap,
  * the same interrupt pin.  We use one SGE response queue per port in this mode
  * and protect all response queues with queue 0's lock.
  */
-static irqreturn_t t3_intr(int irq, void *cookie)
+static irqreturn_t t3_intr(void *cookie)
 {
 	int work_done, w0, w1;
 	struct adapter *adap = cookie;
@@ -2360,7 +2360,7 @@ static irqreturn_t t3_intr(int irq, void *cookie)
  * response queue per port in this mode and protect all response queues with
  * queue 0's lock.
  */
-static irqreturn_t t3b_intr(int irq, void *cookie)
+static irqreturn_t t3b_intr(void *cookie)
 {
 	u32 map;
 	struct adapter *adap = cookie;
@@ -2394,7 +2394,7 @@ static irqreturn_t t3b_intr(int irq, void *cookie)
  * response queue per port in this mode and protect all response queues with
  * queue 0's lock.
  */
-static irqreturn_t t3b_intr_napi(int irq, void *cookie)
+static irqreturn_t t3b_intr_napi(void *cookie)
 {
 	u32 map;
 	struct adapter *adap = cookie;
diff --git a/drivers/net/de600.c b/drivers/net/de600.c
index cb849b0..36eac9a 100644
--- a/drivers/net/de600.c
+++ b/drivers/net/de600.c
@@ -246,7 +246,7 @@ static int de600_start_xmit(struct sk_buff *skb, struct net_device *dev)
  * Handle the network interface interrupts.
  */
 
-static irqreturn_t de600_interrupt(int irq, void *dev_id)
+static irqreturn_t de600_interrupt(void *dev_id)
 {
 	struct net_device	*dev = dev_id;
 	u8		irq_status;
diff --git a/drivers/net/de600.h b/drivers/net/de600.h
index e80ecba..554ab64 100644
--- a/drivers/net/de600.h
+++ b/drivers/net/de600.h
@@ -124,7 +124,7 @@ static int	de600_close(struct net_device *dev);
 static int	de600_start_xmit(struct sk_buff *skb, struct net_device *dev);
 
 /* Dispatch from interrupts. */
-static irqreturn_t de600_interrupt(int irq, void *dev_id);
+static irqreturn_t de600_interrupt(void *dev_id);
 static int	de600_tx_intr(struct net_device *dev, int irq_status);
 static void	de600_rx_intr(struct net_device *dev);
 
diff --git a/drivers/net/de620.c b/drivers/net/de620.c
index 3f5190c..423599a 100644
--- a/drivers/net/de620.c
+++ b/drivers/net/de620.c
@@ -220,7 +220,7 @@ static void	de620_set_multicast_list(struct net_device *);
 static int	de620_start_xmit(struct sk_buff *, struct net_device *);
 
 /* Dispatch from interrupts. */
-static irqreturn_t de620_interrupt(int, void *);
+static irqreturn_t de620_interrupt(void *);
 static int	de620_rx_intr(struct net_device *);
 
 /* Initialization */
@@ -580,7 +580,7 @@ static int de620_start_xmit(struct sk_buff *skb, struct net_device *dev)
  *
  */
 static irqreturn_t
-de620_interrupt(int irq_in, void *dev_id)
+de620_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	byte irq_status;
diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index 00e0194..d758e3e 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -719,7 +719,7 @@ out:
 	spin_unlock(&lp->lock);
 }
 
-static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id)
+static irqreturn_t lance_dma_merr_int(const void *dev_id)
 {
 	struct net_device *dev = dev_id;
 
@@ -727,7 +727,7 @@ static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static irqreturn_t lance_interrupt(const int irq, void *dev_id)
+static irqreturn_t lance_interrupt(const void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct lance_private *lp = netdev_priv(dev);
diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c
index b07613e..cb4dc82 100644
--- a/drivers/net/defxx.c
+++ b/drivers/net/defxx.c
@@ -282,7 +282,7 @@ static int		dfx_close(struct net_device *dev);
 static void		dfx_int_pr_halt_id(DFX_board_t *bp);
 static void		dfx_int_type_0_process(DFX_board_t *bp);
 static void		dfx_int_common(struct net_device *dev);
-static irqreturn_t	dfx_interrupt(int irq, void *dev_id);
+static irqreturn_t	dfx_interrupt(void *dev_id);
 
 static struct		net_device_stats *dfx_ctl_get_stats(struct net_device *dev);
 static void		dfx_ctl_set_multicast_list(struct net_device *dev);
@@ -1874,7 +1874,7 @@ static void dfx_int_common(struct net_device *dev)
  *   Interrupts are disabled, then reenabled at the adapter.
  */
 
-static irqreturn_t dfx_interrupt(int irq, void *dev_id)
+static irqreturn_t dfx_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	DFX_board_t *bp = netdev_priv(dev);
diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index ace39ec..ceb1948 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -517,7 +517,7 @@ struct depca_private {
 */
 static int depca_open(struct net_device *dev);
 static int depca_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t depca_interrupt(int irq, void *dev_id);
+static irqreturn_t depca_interrupt(void *dev_id);
 static int depca_close(struct net_device *dev);
 static int depca_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static void depca_tx_timeout(struct net_device *dev);
@@ -960,7 +960,7 @@ static int depca_start_xmit(struct sk_buff *skb, struct net_device *dev)
 /*
 ** The DEPCA interrupt handler.
 */
-static irqreturn_t depca_interrupt(int irq, void *dev_id)
+static irqreturn_t depca_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct depca_private *lp;
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index 5066beb..682d9ba 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -60,7 +60,7 @@ static void rio_timer (unsigned long data);
 static void rio_tx_timeout (struct net_device *dev);
 static void alloc_list (struct net_device *dev);
 static int start_xmit (struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t rio_interrupt (int irq, void *dev_instance);
+static irqreturn_t rio_interrupt (void *dev_instance);
 static void rio_free_tx (struct net_device *dev, int irq);
 static void tx_error (struct net_device *dev, int tx_status);
 static int receive_packet (struct net_device *dev);
@@ -667,7 +667,7 @@ start_xmit (struct sk_buff *skb, struct net_device *dev)
 }
 
 static irqreturn_t
-rio_interrupt (int irq, void *dev_instance)
+rio_interrupt (void *dev_instance)
 {
 	struct net_device *dev = dev_instance;
 	struct netdev_private *np;
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 27ac010..7dd9c05 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -165,7 +165,7 @@ static int dm9000_stop(struct net_device *);
 static void dm9000_timer(unsigned long);
 static void dm9000_init_dm9000(struct net_device *);
 
-static irqreturn_t dm9000_interrupt(int, void *);
+static irqreturn_t dm9000_interrupt(void *);
 
 static int dm9000_phy_read(struct net_device *dev, int phyaddr_unsused, int reg);
 static void dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg,
@@ -352,7 +352,7 @@ static void dm9000_timeout(struct net_device *dev)
 static void dm9000_poll_controller(struct net_device *dev)
 {
 	disable_irq(dev->irq);
-	dm9000_interrupt(dev->irq,dev);
+	dm9000_interrupt(dev);
 	enable_irq(dev->irq);
 }
 #endif
@@ -799,7 +799,7 @@ dm9000_tx_done(struct net_device *dev, board_info_t * db)
 }
 
 static irqreturn_t
-dm9000_interrupt(int irq, void *dev_id)
+dm9000_interrupt(void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	board_info_t *db;
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 64f35e2..e419ad9 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1959,7 +1959,7 @@ static int e100_rx_alloc_list(struct nic *nic)
 	return 0;
 }
 
-static irqreturn_t e100_intr(int irq, void *dev_id)
+static irqreturn_t e100_intr(void *dev_id)
 {
 	struct net_device *netdev = dev_id;
 	struct nic *nic = netdev_priv(netdev);
@@ -2011,7 +2011,7 @@ static void e100_netpoll(struct net_device *netdev)
 	struct nic *nic = netdev_priv(netdev);
 
 	e100_disable_irq(nic);
-	e100_intr(nic->pdev->irq, netdev);
+	e100_intr(netdev);
 	e100_tx_clean(nic);
 	e100_enable_irq(nic);
 }
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 6c9a643..99df95c 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -885,7 +885,7 @@ e1000_eeprom_test(struct e1000_adapter *adapter, uint64_t *data)
 }
 
 static irqreturn_t
-e1000_test_intr(int irq, void *data)
+e1000_test_intr(void *data)
 {
 	struct net_device *netdev = (struct net_device *) data;
 	struct e1000_adapter *adapter = netdev_priv(netdev);
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 0472638..2f8450d 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -161,8 +161,8 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
 static struct net_device_stats * e1000_get_stats(struct net_device *netdev);
 static int e1000_change_mtu(struct net_device *netdev, int new_mtu);
 static int e1000_set_mac(struct net_device *netdev, void *p);
-static irqreturn_t e1000_intr(int irq, void *data);
-static irqreturn_t e1000_intr_msi(int irq, void *data);
+static irqreturn_t e1000_intr(void *data);
+static irqreturn_t e1000_intr_msi(void *data);
 static boolean_t e1000_clean_tx_irq(struct e1000_adapter *adapter,
                                     struct e1000_tx_ring *tx_ring);
 #ifdef CONFIG_E1000_NAPI
@@ -3748,7 +3748,7 @@ e1000_update_stats(struct e1000_adapter *adapter)
  **/
 
 static irqreturn_t
-e1000_intr_msi(int irq, void *data)
+e1000_intr_msi(void *data)
 {
 	struct net_device *netdev = data;
 	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -3813,7 +3813,7 @@ e1000_intr_msi(int irq, void *data)
  **/
 
 static irqreturn_t
-e1000_intr(int irq, void *data)
+e1000_intr(void *data)
 {
 	struct net_device *netdev = data;
 	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -5236,7 +5236,7 @@ e1000_netpoll(struct net_device *netdev)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 
 	disable_irq(adapter->pdev->irq);
-	e1000_intr(adapter->pdev->irq, netdev);
+	e1000_intr(netdev);
 	e1000_clean_tx_irq(adapter, adapter->tx_ring);
 #ifndef CONFIG_E1000_NAPI
 	adapter->clean_rx(adapter, adapter->rx_ring);
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 0666e62..d29b704 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -837,7 +837,7 @@ static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
 	return *data;
 }
 
-static irqreturn_t e1000_test_intr(int irq, void *data)
+static irqreturn_t e1000_test_intr(void *data)
 {
 	struct net_device *netdev = (struct net_device *) data;
 	struct e1000_adapter *adapter = netdev_priv(netdev);
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 83bda6c..0873bf4 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -310,7 +310,7 @@ struct eepro_local {
 static int	eepro_probe1(struct net_device *dev, int autoprobe);
 static int	eepro_open(struct net_device *dev);
 static in