diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-29 10:18:12 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-29 10:42:18 +0100 |
| commit | e38c2c651a038b78fd01cf2e3f3a65cacf0e41cc (patch) | |
| tree | d40990c037b97e2c113143e3466b4e8f7e3fc40e /drivers/net/irda | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-e38c2c651a038b78fd01cf2e3f3a65cacf0e41cc.tar.xz linux-e38c2c651a038b78fd01cf2e3f3a65cacf0e41cc.zip | |
drivers/net/irda/au1k_ir: fix obvious irq handler bugs
interrupt handlers return a return value these days.
Also, kill always-true test and unneeded void* cast.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/au1k_ir.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c index 4dbdfaaf37bf..a1e4508717c8 100644 --- a/drivers/net/irda/au1k_ir.c +++ b/drivers/net/irda/au1k_ir.c @@ -627,19 +627,16 @@ static int au1k_irda_rx(struct net_device *dev) } -void au1k_irda_interrupt(int irq, void *dev_id) +static irqreturn_t au1k_irda_interrupt(int dummy, void *dev_id) { - struct net_device *dev = (struct net_device *) dev_id; - - if (dev == NULL) { - printk(KERN_ERR "%s: isr: null dev ptr\n", dev->name); - return; - } + struct net_device *dev = dev_id; writel(0, IR_INT_CLEAR); /* ack irda interrupts */ au1k_irda_rx(dev); au1k_tx_ack(dev); + + return IRQ_HANDLED; } |