3 files changed, 8 insertions, 23 deletions

diff --git a/drivers/net/irda/irport.h b/drivers/net/irda/irport.h
index 66fc2433e97d..39829cffba13 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);
-        irqreturn_t (*interrupt)(int irq, void *dev_id);
+        irq_handler_t interrupt;
 };
 
 #endif /* IRPORT_H */
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 7e7b5828214a..1f26da761e9f 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -1505,22 +1505,13 @@ static void smsc_ircc_sir_receive(struct smsc_ircc_cb *self)
  *    An interrupt from the chip has arrived. Time to do some work
  *
  */
-static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id)
+static irqreturn_t smsc_ircc_interrupt(int dummy, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *) dev_id;
-        struct smsc_ircc_cb *self;
+        struct net_device *dev = dev_id;
+        struct smsc_ircc_cb *self = netdev_priv(dev);
         int iobase, iir, lcra, lsr;
         irqreturn_t ret = IRQ_NONE;
 
-        if (dev == NULL) {
-                printk(KERN_WARNING "%s: irq %d for unknown device.\n",
-                       driver_name, irq);
-                goto irq_ret;
-        }
-
-        self = netdev_priv(dev);
-        IRDA_ASSERT(self != NULL, return IRQ_NONE;);
-
         /* Serialise the interrupt handler in various CPUs, stop Tx path */
         spin_lock(&self->lock);
 
@@ -1565,7 +1556,7 @@ static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id)
 
  irq_ret_unlock:
         spin_unlock(&self->lock);
- irq_ret:
+
         return ret;
 }
 
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index 126ec7c8680e..58e128784585 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -1346,19 +1346,13 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)
  *    An interrupt from the chip has arrived. Time to do some work
  *
  */
-static irqreturn_t via_ircc_interrupt(int irq, void *dev_id)
+static irqreturn_t via_ircc_interrupt(int dummy, void *dev_id)
 {
-        struct net_device *dev = (struct net_device *) dev_id;
-        struct via_ircc_cb *self;
+        struct net_device *dev = dev_id;
+        struct via_ircc_cb *self = dev->priv;
         int iobase;
         u8 iHostIntType, iRxIntType, iTxIntType;
 
-        if (!dev) {
-                IRDA_WARNING("%s: irq %d for unknown device.\n", driver_name,
-                             irq);
-                return IRQ_NONE;
-        }
-        self = (struct via_ircc_cb *) dev->priv;
         iobase = self->io.fir_base;
         spin_lock(&self->lock);
         iHostIntType = GetHostStatus(iobase);