44 files changed, 215 insertions, 395 deletions

diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index 7ad0a54779c4..f791bf026e51 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -912,16 +912,11 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
 static irqreturn_t
 el3_interrupt(int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *)dev_id;
+        struct net_device *dev = dev_id;
         struct el3_private *lp;
         int ioaddr, status;
         int i = max_interrupt_work;
 
-        if (dev == NULL) {
-                printk ("el3_interrupt(): irq %d for unknown device.\n", irq);
-                return IRQ_NONE;
-        }
-
         lp = netdev_priv(dev);
         spin_lock(&lp->lock);
 
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index 1c97271112d0..91849469b4f4 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -902,14 +902,11 @@ static void *alloc_rfa(struct net_device *dev, void *ptr)
 static irqreturn_t
 elmc_interrupt(int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *) dev_id;
+        struct net_device *dev = dev_id;
         unsigned short stat;
         struct priv *p;
 
-        if (dev == NULL) {
-                printk(KERN_ERR "elmc-interrupt: irq %d for unknown device.\n", irq);
-                return IRQ_NONE;
-        } else if (!netif_running(dev)) {
+        if (!netif_running(dev)) {
                 /* The 3c523 has this habit of generating interrupts during the
                    reset.  I'm not sure if the ni52 has this same problem, but it's
                    really annoying if we haven't finished initializing it.  I was
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index d516c3225ca4..f4aca5386add 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -1324,11 +1324,6 @@ static irqreturn_t mc32_interrupt(int irq, void *dev_id)
         int rx_event = 0;
         int tx_event = 0;
 
-        if (dev == NULL) {
-                printk(KERN_WARNING "%s: irq %d for unknown device.\n", cardname, irq);
-                return IRQ_NONE;
-        }
-
         ioaddr = dev->base_addr;
         lp = netdev_priv(dev);
 
diff --git a/drivers/net/7990.c b/drivers/net/7990.c
index 8e996b4a34ea..7733697f7776 100644
--- a/drivers/net/7990.c
+++ b/drivers/net/7990.c
@@ -674,7 +674,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, NULL);
+        lance_interrupt(dev->irq, dev);
 }
 #endif
 
diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index fa3442cb1a49..3d1c599ac3cb 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -406,14 +406,8 @@ irqreturn_t ei_interrupt(int irq, void *dev_id)
         int interrupts, nr_serviced = 0;
         struct ei_device *ei_local;
 
-        if (dev == NULL)
-        {
-                printk ("net_interrupt(): irq %d for unknown device.\n", irq);
-                return IRQ_NONE;
-        }
-
         e8390_base = dev->base_addr;
-        ei_local = (struct ei_device *) netdev_priv(dev);
+        ei_local = netdev_priv(dev);
 
         /*
          *      Protect the irq test too.
diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index 062f80e20874..2d306fcb7f36 100644
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -598,17 +598,13 @@ static int atp_send_packet(struct sk_buff *skb, struct net_device *dev)
    Handle the network interface interrupts. */
 static irqreturn_t atp_interrupt(int irq, void *dev_instance)
 {
-        struct net_device *dev = (struct net_device *)dev_instance;
+        struct net_device *dev = dev_instance;
         struct net_local *lp;
         long ioaddr;
         static int num_tx_since_rx;
         int boguscount = max_interrupt_work;
         int handled = 0;
 
-        if (dev == NULL) {
-                printk(KERN_ERR "ATP_interrupt(): irq %d for unknown device.\n", irq);
-                return IRQ_NONE;
-        }
         ioaddr = dev->base_addr;
         lp = netdev_priv(dev);
 
diff --git a/drivers/net/chelsio/cpl5_cmd.h b/drivers/net/chelsio/cpl5_cmd.h
index 27925e487bcf..5b357d9e88d6 100644
--- a/drivers/net/chelsio/cpl5_cmd.h
+++ b/drivers/net/chelsio/cpl5_cmd.h
@@ -108,7 +108,7 @@ struct cpl_tx_pkt_lso {
         u8 iff:4;
 #endif
         u16 vlan;
-        u32 len;
+        __be32 len;
 
         u32 rsvd2;
         u8 rsvd3;
@@ -119,7 +119,7 @@ struct cpl_tx_pkt_lso {
         u8 ip_hdr_words:4;
         u8 tcp_hdr_words:4;
 #endif
-        u16 eth_type_mss;
+        __be16 eth_type_mss;
 };
 
 struct cpl_rx_pkt {
@@ -138,7 +138,7 @@ struct cpl_rx_pkt {
         u8 iff:4;
 #endif
         u16 csum;
-        u16 vlan;
+        __be16 vlan;
         u16 len;
 };
 
diff --git a/drivers/net/de600.c b/drivers/net/de600.c
index d9b006c9e367..690bb40b353d 100644
--- a/drivers/net/de600.c
+++ b/drivers/net/de600.c
@@ -265,12 +265,6 @@ static irqreturn_t de600_interrupt(int irq, void *dev_id)
         int             retrig = 0;
         int             boguscount = 0;
 
-        /* This might just as well be deleted now, no crummy drivers present :-) */
-        if ((dev == NULL) || (DE600_IRQ != irq)) {
-                printk(KERN_ERR "%s: bogus interrupt %d\n", dev?dev->name:"DE-600", irq);
-                return IRQ_NONE;
-        }
-
         spin_lock(&de600_lock);
 
         select_nic();
diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index e179aa1c1ba0..00e2a8a134d7 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -696,7 +696,7 @@ out:
 
 static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *) dev_id;
+        struct net_device *dev = dev_id;
 
         printk("%s: DMA error\n", dev->name);
         return IRQ_HANDLED;
@@ -704,7 +704,7 @@ static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id)
 
 static irqreturn_t lance_interrupt(const int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *) dev_id;
+        struct net_device *dev = dev_id;
         struct lance_private *lp = netdev_priv(dev);
         volatile struct lance_regs *ll = lp->ll;
         int csr0;
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c
index 6b1234b09fb3..a79520295fd0 100644
--- a/drivers/net/dgrs.c
+++ b/drivers/net/dgrs.c
@@ -897,8 +897,8 @@ static int dgrs_ioctl(struct net_device *devN, struct ifreq *ifr, int cmd)
 
 static irqreturn_t dgrs_intr(int irq, void *dev_id)
 {
-        struct net_device       *dev0 = (struct net_device *) dev_id;
-        DGRS_PRIV       *priv0 = (DGRS_PRIV *) dev0->priv;
+        struct net_device       *dev0 = dev_id;
+        DGRS_PRIV       *priv0 = dev0->priv;
         I596_CB         *cbp;
         int             cmd;
         int             i;
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 3641f3b4a2cc..615d2b14efa7 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -346,7 +346,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,NULL);
+        dm9000_interrupt(dev->irq,dev);
         enable_irq(dev->irq);
 }
 #endif
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index aae454aaa1c6..a4eb0dc99ecf 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -994,16 +994,6 @@ static int eepro_open(struct net_device *dev)
                 return -EAGAIN;
         }
 
-#ifdef irq2dev_map
-        if  (((irq2dev_map[dev->irq] != 0)
-                || (irq2dev_map[dev->irq] = dev) == 0) &&
-                (irq2dev_map[dev->irq]!=dev)) {
-                /* printk("%s: IRQ map wrong\n", dev->name); */
-                free_irq(dev->irq, dev);
-                return -EAGAIN;
-        }
-#endif
-
         /* Initialize the 82595. */
 
         eepro_sw2bank2(ioaddr); /* be CAREFUL, BANK 2 now */
@@ -1198,17 +1188,11 @@ static int eepro_send_packet(struct sk_buff *skb, struct net_device *dev)
 static irqreturn_t
 eepro_interrupt(int irq, void *dev_id)
 {
-        struct net_device *dev =  (struct net_device *)dev_id;
-                              /* (struct net_device *)(irq2dev_map[irq]);*/
+        struct net_device *dev = dev_id;
         struct eepro_local *lp;
         int ioaddr, status, boguscount = 20;
         int handled = 0;
 
-        if (dev == NULL) {
-                printk (KERN_ERR "eepro_interrupt(): irq %d for unknown device.\\n", irq);
-                return IRQ_NONE;
-        }
-
         lp = netdev_priv(dev);
 
         spin_lock(&lp->lock);
@@ -1288,10 +1272,6 @@ static int eepro_close(struct net_device *dev)
         /* release the interrupt */
         free_irq(dev->irq, dev);
 
-#ifdef irq2dev_map
-        irq2dev_map[dev->irq] = 0;
-#endif
-
         /* Update the statistics here. What statistics? */
 
         return 0;
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 05ca730fe81e..e14be020e562 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -796,13 +796,6 @@ static irqreturn_t eexp_irq(int irq, void *dev_info)
         unsigned short ioaddr,status,ack_cmd;
         unsigned short old_read_ptr, old_write_ptr;
 
-        if (dev==NULL)
-        {
-                printk(KERN_WARNING "eexpress: irq %d for unknown device\n",
-                       irq);
-                return IRQ_NONE;
-        }
-
         lp = netdev_priv(dev);
         ioaddr = dev->base_addr;
 
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index 971e2dee1e6b..cebf8c374bc5 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -662,19 +662,13 @@ static int ali_ircc_read_dongle_id (int i, chipio_t *info)
  */
 static irqreturn_t ali_ircc_interrupt(int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *) dev_id;
+        struct net_device *dev = dev_id;
         struct ali_ircc_cb *self;
         int ret;
                 
         IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);
                 
-        if (!dev) {
-                IRDA_WARNING("%s: irq %d for unknown device.\n",
-                             ALI_IRCC_DRIVER_NAME, irq);
-                return IRQ_NONE;
-        }       
-        
-        self = (struct ali_ircc_cb *) dev->priv;
+        self = dev->priv;
         
         spin_lock(&self->lock);
         
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 7a9128181e68..16620bd97fbf 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -657,12 +657,6 @@ toshoboe_makemttpacket (struct toshoboe_cb *self, void *buf, int mtt)
   return xbofs;
 }
 
-static int toshoboe_invalid_dev(int irq)
-{
-  printk (KERN_WARNING DRIVER_NAME ": irq %d for unknown device.\n", irq);
-  return 1;
-}
-
 #ifdef USE_PROBE
 /***********************************************************************/
 /* Probe code */
@@ -711,12 +705,9 @@ stuff_byte (__u8 byte, __u8 * buf)
 static irqreturn_t
 toshoboe_probeinterrupt (int irq, void *dev_id)
 {
-  struct toshoboe_cb *self = (struct toshoboe_cb *) dev_id;
+  struct toshoboe_cb *self = dev_id;
   __u8 irqstat;
 
-  if (self == NULL && toshoboe_invalid_dev(irq))
-    return IRQ_NONE;
-
   irqstat = INB (OBOE_ISR);
 
 /* was it us */
@@ -1163,13 +1154,10 @@ dumpbufs(skb->data,skb->len,'>');
 static irqreturn_t
 toshoboe_interrupt (int irq, void *dev_id)
 {
-  struct toshoboe_cb *self = (struct toshoboe_cb *) dev_id;
+  struct toshoboe_cb *self = dev_id;
   __u8 irqstat;
   struct sk_buff *skb = NULL;
 
-  if (self == NULL && toshoboe_invalid_dev(irq))
-    return IRQ_NONE;
-
   irqstat = INB (OBOE_ISR);
 
 /* was it us */
@@ -1357,13 +1345,11 @@ toshoboe_net_open (struct net_device *dev)
 {
   struct toshoboe_cb *self;
   unsigned long flags;
+  int rc;
 
   IRDA_DEBUG (4, "%s()\n", __FUNCTION__);
 
-  IRDA_ASSERT (dev != NULL, return -1; );
-  self = (struct toshoboe_cb *) dev->priv;
-
-  IRDA_ASSERT (self != NULL, return 0; );
+  self = netdev_priv(dev);
 
   if (self->async)
     return -EBUSY;
@@ -1371,11 +1357,10 @@ toshoboe_net_open (struct net_device *dev)
   if (self->stopped)
     return 0;
 
-  if (request_irq (self->io.irq, toshoboe_interrupt,
-                   IRQF_SHARED | IRQF_DISABLED, dev->name, (void *) self))
-    {
-      return -EAGAIN;
-    }
+  rc = request_irq (self->io.irq, toshoboe_interrupt,
+                    IRQF_SHARED | IRQF_DISABLED, dev->name, self);
+  if (rc)
+        return rc;
 
   spin_lock_irqsave(&self->spinlock, flags);
   toshoboe_startchip (self);
diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c
index 6ea78ececca7..654a68b490ae 100644
--- a/drivers/net/irda/irport.c
+++ b/drivers/net/irda/irport.c
@@ -766,18 +766,14 @@ static inline void irport_receive(struct irport_cb *self)
  */
 static irqreturn_t irport_interrupt(int irq, void *dev_id) 
 {
-        struct net_device *dev = (struct net_device *) dev_id;
+        struct net_device *dev = dev_id;
         struct irport_cb *self;
         int boguscount = 0;
         int iobase;
         int iir, lsr;
         int handled = 0;
 
-        if (!dev) {
-                IRDA_WARNING("%s() irq %d for unknown device.\n", __FUNCTION__, irq);
-                return IRQ_NONE;
-        }
-        self = (struct irport_cb *) dev->priv;
+        self = dev->priv;
 
         spin_lock(&self->lock);
 
diff --git a/drivers/net/irda/irport.h b/drivers/net/irda/irport.h
index 4393168347e3..3f46b84c6c85 100644
--- a/drivers/net/irda/irport.h
+++ b/drivers/net/irda/irport.h
@@ -74,7 +74,7 @@ struct irport_cb {
         /* For piggyback drivers */
         void *priv;                
         void (*change_speed)(void *priv, __u32 speed);
-        int (*interrupt)(int irq, void *dev_id);
+        irqreturn_t (*interrupt)(int irq, void *dev_id);
 };
 
 #endif /* IRPORT_H */
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index ea12e999814a..29b5ccd29d0b 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -2068,17 +2068,12 @@ static void nsc_ircc_fir_interrupt(struct nsc_ircc_cb *self, int iobase,
  */
 static irqreturn_t nsc_ircc_interrupt(int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *) dev_id;
+        struct net_device *dev = dev_id;
         struct nsc_ircc_cb *self;
         __u8 bsr, eir;
         int iobase;
 
-        if (!dev) {
-                IRDA_WARNING("%s: irq %d for unknown device.\n",
-                             driver_name, irq);
-                return IRQ_NONE;
-        }
-        self = (struct nsc_ircc_cb *) dev->priv;
+        self = dev->priv;
 
         spin_lock(&self->lock); 
 
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
index b4fb92a7baa8..4212657fa4f9 100644
--- a/drivers/net/irda/w83977af_ir.c
+++ b/drivers/net/irda/w83977af_ir.c
@@ -1113,17 +1113,12 @@ static __u8 w83977af_fir_interrupt(struct w83977af_ir *self, int isr)
  */
 static irqreturn_t w83977af_interrupt(int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *) dev_id;
+        struct net_device *dev = dev_id;
         struct w83977af_ir *self;
         __u8 set, icr, isr;
         int iobase;
 
-        if (!dev) {
-                printk(KERN_WARNING "%s: irq %d for unknown device.\n", 
-                        driver_name, irq);
-                return IRQ_NONE;
-        }
-        self = (struct w83977af_ir *) dev->priv;
+        self = dev->priv;
 
         iobase = self->io.fir_base;
 
diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index 7afac47e59ad..6efbd499d752 100644
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -1019,11 +1019,6 @@ static irqreturn_t lance_interrupt(int irq, void *dev_id)
         int csr0, ioaddr, boguscnt=10;
         int must_restart;
 
-        if (dev == NULL) {
-                printk ("lance_interrupt(): irq %d for unknown device.\n", irq);
-                return IRQ_NONE;
-        }
-
         ioaddr = dev->base_addr;
         lp = dev->priv;
 
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index 8cbd940f0ac2..f4d815bca643 100644
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -1252,7 +1252,7 @@ static int __devinit i82596_probe(struct net_device *dev,
 static void i596_poll_controller(struct net_device *dev)
 {
         disable_irq(dev->irq);
-        i596_interrupt(dev->irq, dev, NULL);
+        i596_interrupt(dev->irq, dev);
         enable_irq(dev->irq);
 }
 #endif
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index d26a819a9735..2ffa3a59e704 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1251,7 +1251,7 @@ static void mv643xx_netpoll(struct net_device *netdev)
         /* wait for previous write to complete */
         mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num));
 
-        mv643xx_eth_int_handler(netdev->irq, netdev, NULL);
+        mv643xx_eth_int_handler(netdev->irq, netdev);
 
         mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
 }
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index e5f366910914..5ddd5742f779 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1201,14 +1201,8 @@ static irqreturn_t ax_interrupt(int irq, void *dev_id)
         struct ei_device *ei_local;
         int handled = 0;
 
-        if (dev == NULL) 
-        {
-                printk ("net_interrupt(): irq %d for unknown device.\n", irq);
-                return IRQ_NONE;
-        }
-    
         e8390_base = dev->base_addr;
-        ei_local = (struct ei_device *) netdev_priv(dev);
+        ei_local = netdev_priv(dev);
 
         /*
          *      Protect the irq test too.
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index c73e2f210774..36f9d988278f 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -2569,13 +2569,6 @@ pcnet32_interrupt(int irq, void *dev_id)
         u16 csr0;
         int boguscnt = max_interrupt_work;
 
-        if (!dev) {
-                if (pcnet32_debug & NETIF_MSG_INTR)
-                        printk(KERN_DEBUG "%s(): irq %d for unknown device\n",
-                               __FUNCTION__, irq);
-                return IRQ_NONE;
-        }
-
         ioaddr = dev->base_addr;
         lp = dev->priv;
 
diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index c0b333d2917a..71afb274498f 100644
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -909,11 +909,6 @@ plip_interrupt(int irq, void *dev_id)
         struct plip_local *rcv;
         unsigned char c0;
 
-        if (dev == NULL) {
-                printk(KERN_DEBUG "plip_interrupt: irq %d for unknown device.\n", irq);
-                return;
-        }
-
         nl = netdev_priv(dev);
         rcv = &nl->rcv_data;
 
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 72f52dc98f53..12b719f4d00f 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -116,179 +116,179 @@ typedef struct {
 /* The statistics block of Xena */
 typedef struct stat_block {
 /* Tx MAC statistics counters. */
-        u32 tmac_data_octets;
-        u32 tmac_frms;
-        u64 tmac_drop_frms;
-        u32 tmac_bcst_frms;
-        u32 tmac_mcst_frms;
-        u64 tmac_pause_ctrl_frms;
-        u32 tmac_ucst_frms;
-        u32 tmac_ttl_octets;
-        u32 tmac_any_err_frms;
-        u32 tmac_nucst_frms;
-        u64 tmac_ttl_less_fb_octets;
-        u64 tmac_vld_ip_octets;
-        u32 tmac_drop_ip;
-        u32 tmac_vld_ip;
-        u32 tmac_rst_tcp;
-        u32 tmac_icmp;
-        u64 tmac_tcp;
-        u32 reserved_0;
-        u32 tmac_udp;
+        __le32 tmac_data_octets;
+        __le32 tmac_frms;
+        __le64 tmac_drop_frms;
+        __le32 tmac_bcst_frms;
+        __le32 tmac_mcst_frms;
+        __le64 tmac_pause_ctrl_frms;
+        __le32 tmac_ucst_frms;
+        __le32 tmac_ttl_octets;
+        __le32 tmac_any_err_frms;
+        __le32 tmac_nucst_frms;
+        __le64 tmac_ttl_less_fb_octets;
+        __le64 tmac_vld_ip_octets;
+        __le32 tmac_drop_ip;
+        __le32 tmac_vld_ip;
+        __le32 tmac_rst_tcp;
+        __le32 tmac_icmp;
+        __le64 tmac_tcp;
+        __le32 reserved_0;
+        __le32 tmac_udp;
 
 /* Rx MAC Statistics counters. */
-        u32 rmac_data_octets;
-        u32 rmac_vld_frms;
-        u64 rmac_fcs_err_frms;
-        u64 rmac_drop_frms;
-        u32 rmac_vld_bcst_frms;
-        u32 rmac_vld_mcst_frms;
-        u32 rmac_out_rng_len_err_frms;
-        u32 rmac_in_rng_len_err_frms;
-        u64 rmac_long_frms;
-        u64 rmac_pause_ctrl_frms;
-        u64 rmac_unsup_ctrl_frms;
-        u32 rmac_accepted_ucst_frms;
-        u32 rmac_ttl_octets;
-        u32 rmac_discarded_frms;
-        u32 rmac_accepted_nucst_frms;
-        u32 reserved_1;
-        u32 rmac_drop_events;
-        u64 rmac_ttl_less_fb_octets;
-        u64 rmac_ttl_frms;
-        u64 reserved_2;
-        u32 rmac_usized_frms;
-        u32 reserved_3;
-        u32 rmac_frag_frms;
-        u32 rmac_osized_frms;
-        u32 reserved_4;
-        u32 rmac_jabber_frms;
-        u64 rmac_ttl_64_frms;
-        u64 rmac_ttl_65_127_frms;
-        u64 reserved_5;
-        u64 rmac_ttl_128_255_frms;
-        u64 rmac_ttl_256_511_frms;
-        u64 reserved_6;
-        u64 rmac_ttl_512_1023_frms;
-        u64 rmac_ttl_1024_1518_frms;
-        u32 rmac_ip;
-        u32 reserved_7;
-        u64 rmac_ip_octets;
-        u32 rmac_drop_ip;
-        u32 rmac_hdr_err_ip;
-        u32 reserved_8;
-        u32 rmac_icmp;
-        u64 rmac_tcp;
-        u32 rmac_err_drp_udp;
-        u32 rmac_udp;
-        u64 rmac_xgmii_err_sym;
-        u64 rmac_frms_q0;
-        u64 rmac_frms_q1;
-        u64 rmac_frms_q2;
-        u64 rmac_frms_q3;
-        u64 rmac_frms_q4;
-        u64 rmac_frms_q5;
-        u64 rmac_frms_q6;
-        u64 rmac_frms_q7;
-        u16 rmac_full_q3;
-        u16 rmac_full_q2;
-        u16 rmac_full_q1;
-        u16 rmac_full_q0;
-        u16 rmac_full_q7;
-        u16 rmac_full_q6;
-        u16 rmac_full_q5;
-        u16 rmac_full_q4;
-        u32 reserved_9;
-        u32 rmac_pause_cnt;
-        u64 rmac_xgmii_data_err_cnt;
-        u64 rmac_xgmii_ctrl_err_cnt;
-        u32 rmac_err_tcp;
-        u32 rmac_accepted_ip;
+        __le32 rmac_data_octets;
+        __le32 rmac_vld_frms;
+        __le64 rmac_fcs_err_frms;
+        __le64 rmac_drop_frms;
+        __le32 rmac_vld_bcst_frms;
+        __le32 rmac_vld_mcst_frms;
+        __le32 rmac_out_rng_len_err_frms;
+        __le32 rmac_in_rng_len_err_frms;
+        __le64 rmac_long_frms;
+        __le64 rmac_pause_ctrl_frms;
+        __le64 rmac_unsup_ctrl_frms;
+        __le32 rmac_accepted_ucst_frms;
+        __le32 rmac_ttl_octets;
+        __le32 rmac_discarded_frms;
+        __le32 rmac_accepted_nucst_frms;
+        __le32 reserved_1;
+        __le32 rmac_drop_events;
+        __le64 rmac_ttl_less_fb_octets;
+        __le64 rmac_ttl_frms;
+        __le64 reserved_2;
+        __le32 rmac_usized_frms;
+        __le32 reserved_3;
+        __le32 rmac_frag_frms;
+        __le32 rmac_osized_frms;
+        __le32 reserved_4;
+        __le32 rmac_jabber_frms;
+        __le64 rmac_ttl_64_frms;
+        __le64 rmac_ttl_65_127_frms;
+        __le64 reserved_5;
+        __le64 rmac_ttl_128_255_frms;
+        __le64 rmac_ttl_256_511_frms;
+        __le64 reserved_6;
+        __le64 rmac_ttl_512_1023_frms;
+        __le64 rmac_ttl_1024_1518_frms;
+        __le32 rmac_ip;
+        __le32 reserved_7;
+        __le64 rmac_ip_octets;
+        __le32 rmac_drop_ip;
+        __le32 rmac_hdr_err_ip;
+        __le32 reserved_8;
+        __le32 rmac_icmp;
+        __le64 rmac_tcp;
+        __le32 rmac_err_drp_udp;
+        __le32 rmac_udp;
+        __le64 rmac_xgmii_err_sym;
+        __le64 rmac_frms_q0;
+        __le64 rmac_frms_q1;
+        __le64 rmac_frms_q2;
+        __le64 rmac_frms_q3;
+        __le64 rmac_frms_q4;
+        __le64 rmac_frms_q5;
+        __le64 rmac_frms_q6;
+        __le64 rmac_frms_q7;
+        __le16 rmac_full_q3;
+        __le16 rmac_full_q2;
+        __le16 rmac_full_q1;
+        __le16 rmac_full_q0;
+        __le16 rmac_full_q7;
+        __le16 rmac_full_q6;
+        __le16 rmac_full_q5;
+        __le16 rmac_full_q4;
+        __le32 reserved_9;
+        __le32 rmac_pause_cnt;
+        __le64 rmac_xgmii_data_err_cnt;
+        __le64 rmac_xgmii_ctrl_err_cnt;
+        __le32 rmac_err_tcp;
+        __le32 rmac_accepted_ip;
 
 /* PCI/PCI-X Read transaction statistics. */
-        u32 new_rd_req_cnt;
-        u32 rd_req_cnt;
-        u32 rd_rtry_cnt;
-        u32 new_rd_req_rtry_cnt;
+        __le32 new_rd_req_cnt;
+        __le32 rd_req_cnt;
+        __le32 rd_rtry_cnt;
+        __le32 new_rd_req_rtry_cnt;
 
 /* PCI/PCI-X Write/Read transaction statistics. */
-        u32 wr_req_cnt;
-        u32 wr_rtry_rd_ack_cnt;
-        u32 new_wr_req_rtry_cnt;
-        u32 new_wr_req_cnt;
-        u32 wr_disc_cnt;
-        u32 wr_rtry_cnt;
+        __le32 wr_req_cnt;
+        __le32 wr_rtry_rd_ack_cnt;
+        __le32 new_wr_req_rtry_cnt;
+        __le32 new_wr_req_cnt;
+        __le32 wr_disc_cnt;
+        __le32 wr_rtry_cnt;
 
 /*      PCI/PCI-X Write / DMA Transaction statistics. */
-        u32 txp_wr_cnt;
-        u32 rd_rtry_wr_ack_cnt;
-        u32 txd_wr_cnt;
-        u32 txd_rd_cnt;
-        u32 rxd_wr_cnt;
-        u32 rxd_rd_cnt;
-        u32 rxf_wr_cnt;
-        u32 txf_rd_cnt;
+        __le32 txp_wr_cnt;
+        __le32 rd_rtry_wr_ack_cnt;
+        __le32 txd_wr_cnt;
+        __le32 txd_rd_cnt;
+        __le32 rxd_wr_cnt;
+        __le32 rxd_rd_cnt;
+        __le32 rxf_wr_cnt;
+        __le32 txf_rd_cnt;
 
 /* Tx MAC statistics overflow counters. */
-        u32 tmac_data_octets_oflow;
-        u32 tmac_frms_oflow;
-        u32 tmac_bcst_frms_oflow;
-        u32 tmac_mcst_frms_oflow;
-        u32 tmac_ucst_frms_oflow;
-        u32 tmac_ttl_octets_oflow;
-        u32 tmac_any_err_frms_oflow;
-        u32 tmac_nucst_frms_oflow;
-        u64 tmac_vlan_frms;
-        u32 tmac_drop_ip_oflow;
-        u32 tmac_vld_ip_oflow;
-        u32 tmac_rst_tcp_oflow;
-        u32 tmac_icmp_oflow;
-        u32 tpa_unknown_protocol;
-        u32 tmac_udp_oflow;
-        u32 reserved_10;
-        u32 tpa_parse_failure;
+        __le32 tmac_data_octets_oflow;
+        __le32 tmac_frms_oflow;
+        __le32 tmac_bcst_frms_oflow;
+        __le32 tmac_mcst_frms_oflow;
+        __le32 tmac_ucst_frms_oflow;
+        __le32 tmac_ttl_octets_oflow;
+        __le32 tmac_any_err_frms_oflow;
+        __le32 tmac_nucst_frms_oflow;
+        __le64 tmac_vlan_frms;
+        __le32 tmac_drop_ip_oflow;
+        __le32 tmac_vld_ip_oflow;
+        __le32 tmac_rst_tcp_oflow;
+        __le32 tmac_icmp_oflow;
+        __le32 tpa_unknown_protocol;
+        __le32 tmac_udp_oflow;
+        __le32 reserved_10;
+        __le32 tpa_parse_failure;
 
 /* Rx MAC Statistics overflow counters. */
-        u32 rmac_data_octets_oflow;
-        u32 rmac_vld_frms_oflow;
-        u32 rmac_vld_bcst_frms_oflow;
-        u32 rmac_vld_mcst_frms_oflow;
-        u32 rmac_accepted_ucst_frms_oflow;
-        u32 rmac_ttl_octets_oflow;
-        u32 rmac_discarded_frms_oflow;
-        u32 rmac_accepted_nucst_frms_oflow;
-        u32 rmac_usized_frms_oflow;
-        u32 rmac_drop_events_oflow;
-        u32 rmac_frag_frms_oflow;
-        u32 rmac_osized_frms_oflow;
-        u32 rmac_ip_oflow;
-        u32 rmac_jabber_frms_oflow;
-        u32 rmac_icmp_oflow;
-        u32 rmac_drop_ip_oflow;
-        u32 rmac_err_drp_udp_oflow;
-        u32 rmac_udp_oflow;
-        u32 reserved_11;
-        u32 rmac_pause_cnt_oflow;
-        u64 rmac_ttl_1519_4095_frms;
-        u64 rmac_ttl_4096_8191_frms;
-        u64 rmac_ttl_8192_max_frms;
-        u64 rmac_ttl_gt_max_frms;
-        u64 rmac_osized_alt_frms;
-        u64 rmac_jabber_alt_frms;
-        u64 rmac_gt_max_alt_frms;
-        u64 rmac_vlan_frms;
-        u32 rmac_len_discard;
-        u32 rmac_fcs_discard;
-        u32 rmac_pf_discard;
-        u32 rmac_da_discard;
-        u32 rmac_red_discard;
-        u32 rmac_rts_discard;
-        u32 reserved_12;
-        u32 rmac_ingm_full_discard;
-        u32 reserved_13;
-        u32 rmac_accepted_ip_oflow;
-        u32 reserved_14;
-        u32 link_fault_cnt;
+        __le32 rmac_data_octets_oflow;
+        __le32 rmac_vld_frms_oflow;
+        __le32 rmac_vld_bcst_frms_oflow;
+        __le32 rmac_vld_mcst_frms_oflow;
+        __le32 rmac_accepted_ucst_frms_oflow;
+        __le32 rmac_ttl_octets_oflow;
+        __le32 rmac_discarded_frms_oflow;
+        __le32 rmac_accepted_nucst_frms_oflow;
+        __le32 rmac_usized_frms_oflow;
+        __le32 rmac_drop_events_oflow;
+        __le32 rmac_frag_frms_oflow;
+        __le32 rmac_osized_frms_oflow;
+        __le32 rmac_ip_oflow;
+        __le32 rmac_jabber_frms_oflow;
+        __le32 rmac_icmp_oflow;
+        __le32 rmac_drop_ip_oflow;
+        __le32 rmac_err_drp_udp_oflow;
+        __le32 rmac_udp_oflow;
+        __le32 reserved_11;
+        __le32 rmac_pause_cnt_oflow;
+        __le64 rmac_ttl_1519_4095_frms;
+        __le64 rmac_ttl_4096_8191_frms;
+        __le64 rmac_ttl_8192_max_frms;
+        __le64 rmac_ttl_gt_max_frms;
+        __le64 rmac_osized_alt_frms;
+        __le64 rmac_jabber_alt_frms;
+        __le64 rmac_gt_max_alt_frms;
+        __le64 rmac_vlan_frms;
+        __le32 rmac_len_discard;
+        __le32 rmac_fcs_discard;
+        __le32 rmac_pf_discard;
+        __le32 rmac_da_discard;
+        __le32 rmac_red_discard;
+        __le32 rmac_rts_discard;
+        __le32 reserved_12;
+        __le32 rmac_ingm_full_discard;
+        __le32 reserved_13;
+        __le32 rmac_accepted_ip_oflow;
+        __le32 reserved_14;
+        __le32 link_fault_cnt;
         u8  buffer[20];
         swStat_t sw_stat;
         xpakStat_t xpak_stat;
diff --git a/drivers/net/saa9730.c b/drivers/net/saa9730.c
index c9efad8a917e..b269513cde45 100644
--- a/drivers/net/saa9730.c
+++ b/drivers/net/saa9730.c
@@ -747,7 +747,7 @@ static int lan_saa9730_rx(struct net_device *dev)
 
 static irqreturn_t lan_saa9730_interrupt(const int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *) dev_id;
+        struct net_device *dev = dev_id;
         struct lan_saa9730_private *lp = netdev_priv(dev);
 
         if (lan_saa9730_debug > 5)
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index dc30dee5537f..b9fa4fbb1398 100644
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -1084,19 +1084,13 @@ static irqreturn_t sb1000_interrupt(int irq, void *dev_id)
         char *name;
         unsigned char st;
         int ioaddr[2];
-        struct net_device *dev = (struct net_device *) dev_id;
+        struct net_device *dev = dev_id;
         struct sb1000_private *lp = netdev_priv(dev);
 
         const unsigned char Command0[6] = {0x80, 0x2c, 0x00, 0x00, 0x00, 0x00};
         const unsigned char Command1[6] = {0x80, 0x2e, 0x00, 0x00, 0x00, 0x00};
         const int MaxRxErrorCount = 6;
 
-        if (dev == NULL) {
-                printk(KERN_ERR "sb1000_interrupt(): irq %d for unknown device.\n",
-                        irq);
-                return IRQ_NONE;
-        }
-
         ioaddr[0] = dev->base_addr;
         /* mem_start holds the second I/O address */
         ioaddr[1] = dev->mem_start;
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index 06ea2626c6f4..9733a11c6146 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -616,15 +616,10 @@ static int skfp_close(struct net_device *dev)
 
 irqreturn_t skfp_interrupt(int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *) dev_id;
+        struct net_device *dev = dev_id;
         struct s_smc *smc;      /* private board structure pointer */
         skfddi_priv *bp;
 
-        if (dev == NULL) {
-                printk("%s: irq %d for unknown device\n", dev->name, irq);
-                return IRQ_NONE;
-        }
-
         smc = netdev_priv(dev);
         bp = &smc->os;
 
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 506807fa5268..95b6478f55c6 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -1400,7 +1400,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id)
 static void smc_poll_controller(struct net_device *dev)
 {
         disable_irq(dev->irq);
-        smc_interrupt(dev->irq, dev, NULL);
+        smc_interrupt(dev->irq, dev);
         enable_irq(dev->irq);
 }
 #endif
diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c
index cfece9676aff..ed7aa0a5acca 100644
--- a/drivers/net/sonic.c
+++ b/drivers/net/sonic.c
@@ -295,15 +295,10 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
  */
 static irqreturn_t sonic_interrupt(int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *) dev_id;
+        struct net_device *dev = dev_id;
         struct sonic_local *lp = netdev_priv(dev);
         int status;
 
-        if (dev == NULL) {
-                printk(KERN_ERR "sonic_interrupt: irq %d for unknown device.\n", irq);
-                return IRQ_NONE;
-        }
-
         if (!(status = SONIC_READ(SONIC_ISR) & SONIC_IMR_DEFAULT))
                 return IRQ_NONE;
 
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 45d07faf7b96..9d7cd130c19d 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2095,8 +2095,8 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)
 
 static irqreturn_t happy_meal_interrupt(int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *) dev_id;
-        struct happy_meal *hp  = dev->priv;
+        struct net_device *dev = dev_id;
+        struct happy_meal *hp  = netdev_priv(dev);
         u32 happy_status       = hme_read32(hp, hp->gregs + GREG_STAT);
 
         HMD(("happy_meal_interrupt: status=%08x ", happy_status));
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 9207e19cac34..5b00d79b5573 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -822,7 +822,7 @@ out:
 
 static irqreturn_t lance_interrupt(int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *)dev_id;
+        struct net_device *dev = dev_id;
         struct lance_private *lp = netdev_priv(dev);
         int csr0;
 
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 020e78170595..7874eb1ef043 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -468,7 +468,7 @@ static void qe_tx_reclaim(struct sunqe *qep);
  */
 static irqreturn_t qec_interrupt(int irq, void *dev_id)
 {
-        struct sunqec *qecp = (struct sunqec *) dev_id;
+        struct sunqec *qecp = dev_id;
         u32 qec_status;
         int channel = 0;
 
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 9bd4cba87872..46dabdb12071 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -1990,15 +1990,8 @@ static irqreturn_t smctr_interrupt(int irq, void *dev_id)
         __u8 isb_type, isb_subtype;
         __u16 isb_index;
 
-        if(dev == NULL)
-        {
-                printk(KERN_CRIT "%s: irq %d for unknown device.\n", dev->name, irq);
-                return IRQ_NONE;
-        }
-
         ioaddr = dev->base_addr;
         tp = netdev_priv(dev);
-        
 
         if(tp->status == NOT_INITIALIZED)
                 return IRQ_NONE;
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index c0ab6e44eb1f..ea797ca2b988 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -751,11 +751,6 @@ irqreturn_t tms380tr_interrupt(int irq, void *dev_id)
         unsigned short irq_type;
         int handled = 0;
 
-        if(dev == NULL) {
-                printk(KERN_INFO "%s: irq %d for unknown device.\n", dev->name, irq);
-                return IRQ_NONE;
-        }
-
         tp = netdev_priv(dev);
 
         irq_type = SIFREADW(SIFSTS);
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index e17f9779ead2..3f4b6408b755 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -1540,16 +1540,12 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)
 static irqreturn_t
 de4x5_interrupt(int irq, void *dev_id)
 {
-    struct net_device *dev = (struct net_device *)dev_id;
+    struct net_device *dev = dev_id;
     struct de4x5_private *lp;
     s32 imr, omr, sts, limit;
     u_long iobase;
     unsigned int handled = 0;
 
-    if (dev == NULL) {
-        printk ("de4x5_interrupt(): irq %d for unknown device.\n", irq);
-        return IRQ_NONE;
-    }
     lp = netdev_priv(dev);
     spin_lock(&lp->lock);
     iobase = dev->base_addr;
diff --git a/drivers/net/wan/cycx_main.c b/drivers/net/wan/cycx_main.c
index 12363e056b63..6e5f1c898517 100644
--- a/drivers/net/wan/cycx_main.c
+++ b/drivers/net/wan/cycx_main.c
@@ -303,9 +303,9 @@ out:	return ret;
  */
 static irqreturn_t cycx_isr(int irq, void *dev_id)
 {
-        struct cycx_device *card = (struct cycx_device *)dev_id;
+        struct cycx_device *card = dev_id;
 
-        if (!card || card->wandev.state == WAN_UNCONFIGURED)
+        if (card->wandev.state == WAN_UNCONFIGURED)
                 goto out;
 
         if (card->in_isr) {
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 5715d25271f1..6a485f0556f4 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -875,13 +875,7 @@ static irqreturn_t sdla_isr(int irq, void *dev_id)
 
         dev = dev_id;
 
-        if (dev == NULL)
-        {
-                printk(KERN_WARNING "sdla_isr(): irq %d for unknown device.\n", irq);
-                return IRQ_NONE;
-        }
-
-        flp = dev->priv;
+        flp = netdev_priv(dev);
 
         if (!flp->initialized)
         {
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 793da5f69344..b779c7dcc1a8 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -1954,7 +1954,7 @@ static void __orinoco_ev_wterr(struct net_device *dev, hermes_t *hw)
 
 irqreturn_t orinoco_interrupt(int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *)dev_id;
+        struct net_device *dev = dev_id;
         struct orinoco_private *priv = netdev_priv(dev);
         hermes_t *hw = &priv->hw;
         int count = MAX_IRQLOOPS_PER_IRQ;
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index cadfe132db84..aafb301041b1 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -4119,21 +4119,12 @@ static irqreturn_t
 wavelan_interrupt(int           irq,
                   void *        dev_id)
 {
-  struct net_device *   dev;
+  struct net_device *   dev = dev_id;
   net_local *   lp;
   kio_addr_t    base;
   int           status0;
   u_int         tx_status;
 
-  if ((dev = dev_id) == NULL)
-    {
-#ifdef DEBUG_INTERRUPT_ERROR
-      printk(KERN_WARNING "wavelan_interrupt(): irq %d for unknown device.\n",
-             irq);
-#endif
-      return IRQ_NONE;
-    }
-
 #ifdef DEBUG_INTERRUPT_TRACE
   printk(KERN_DEBUG "%s: ->wavelan_interrupt()\n", dev->name);
 #endif
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index a1430352169b..5b98a7876982 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1155,25 +1155,18 @@ static inline void wl3501_ack_interrupt(struct wl3501_card *this)
  */
 static irqreturn_t wl3501_interrupt(int irq, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *)dev_id;
+        struct net_device *dev = dev_id;
         struct wl3501_card *this;
-        int handled = 1;
 
-        if (!dev)
-                goto unknown;
-        this = dev->priv;
+        this = netdev_priv(dev);
         spin_lock(&this->lock);
         wl3501_ack_interrupt(this);
         wl3501_block_interrupt(this);
         wl3501_rx_interrupt(dev);
         wl3501_unblock_interrupt(this);
         spin_unlock(&this->lock);
-out:
-        return IRQ_RETVAL(handled);
-unknown:
-        handled = 0;
-        printk(KERN_ERR "%s: irq %d for unknown device.\n", __FUNCTION__, irq);
-        goto out;
+
+        return IRQ_HANDLED;
 }
 
 static int wl3501_reset_board(struct wl3501_card *this)
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index ac600212d9a9..2412ce4917f2 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -896,13 +896,6 @@ static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance)
         int boguscnt = max_interrupt_work;
         unsigned int handled = 0;
 
-#ifndef final_version                   /* Can never occur. */
-        if (dev == NULL) {
-                printk (KERN_ERR "yellowfin_interrupt(): irq %d for unknown device.\n", irq);
-                return IRQ_NONE;
-        }
-#endif
-
         yp = netdev_priv(dev);
         ioaddr = yp->base;
 
diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index 2068a109a86c..b24b0727108c 100644
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -610,11 +610,6 @@ static irqreturn_t znet_interrupt(int irq, void *dev_id)
         int boguscnt = 20;
         int handled = 0;
 
-        if (dev == NULL) {
-                printk(KERN_WARNING "znet_interrupt(): IRQ %d for unknown device.\n", irq);
-                return IRQ_NONE;
-        }
-
         spin_lock (&znet->lock);
 
         ioaddr = dev->base_addr;