[PATCH] drivers/net/irda/au1k_ir: fix obvious irq handler bugs

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Jeff Garzik
Date: Friday, October 26, 2007 - 2:40 am

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>
---
 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 4dbdfaa..a1e4508 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;
 }
 
 
-- 
1.5.2.4

-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] Remove pointless casts from void pointers,, Jeff Garzik, (Fri Oct 26, 2:40 am)
[PATCH] Remove always-true tests in irq handlers, Jeff Garzik, (Fri Oct 26, 2:40 am)
[PATCH] ARM: Misc minor interrupt handler cleanups, Jeff Garzik, (Fri Oct 26, 2:40 am)
[PATCH] IA64, PPC, SPARC: minor irq handler cleanups, Jeff Garzik, (Fri Oct 26, 2:40 am)
[PATCH] drivers/net/irda/au1k_ir: fix obvious irq handler bugs, Jeff Garzik, (Fri Oct 26, 2:40 am)
[PATCH] SCSI/gdth: kill unneeded 'irq' argument, Jeff Garzik, (Fri Oct 26, 2:40 am)
Re: [PATCH] Remove always-true tests in irq handlers, Ralf Baechle, (Fri Oct 26, 5:02 am)
Re: [PATCH] Remove pointless casts from void pointers,, John W. Linville, (Fri Oct 26, 5:24 am)
Re: [PATCH] Remove pointless casts from void pointers,, Dmitry Torokhov, (Fri Oct 26, 6:38 am)
Re: [PATCH] Remove pointless casts from void pointers,, Holger Schurig, (Fri Oct 26, 7:55 am)
Re: [PATCH] ARM: Misc minor interrupt handler cleanups, Lennert Buytenhek, (Fri Oct 26, 2:56 pm)
Re: [PATCH] Remove pointless casts from void pointers,, Lennert Buytenhek, (Fri Oct 26, 2:58 pm)
Re: [PATCH] SCSI/gdth: kill unneeded 'irq' argument, Boaz Harrosh, (Mon Oct 29, 2:22 am)