Merge branch 'master' into upstream-fixes

1 files changed, 3 insertions, 9 deletions

diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
index 7de1afdeec3d..4212657fa4f9 100644
--- a/drivers/net/irda/w83977af_ir.c
+++ b/drivers/net/irda/w83977af_ir.c
@@ -1111,20 +1111,14 @@ static __u8 w83977af_fir_interrupt(struct w83977af_ir *self, int isr)
  *    An interrupt from the chip has arrived. Time to do some work
  *
  */
-static irqreturn_t w83977af_interrupt(int irq, void *dev_id,
-                                        struct pt_regs *regs)
+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;