Improve type handling in interrupt handlers

This improves typechecking of interrupt handlers by removing
unnecessary (void *) casts and storing handlers in correctly-typed
variables.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Ash Willis <ashwillis@programmer.net>
Cc: linux-pcmcia@lists.infradead.org
---
 drivers/net/eth16i.c      |    2 +-
 drivers/net/ewrk3.c       |    2 +-
 drivers/net/skfp/skfddi.c |    2 +-
 include/pcmcia/cs.h       |    3 ++-
 sound/pci/als300.c        |    2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff -r 0de5002b2c73 drivers/net/eth16i.c
--- a/drivers/net/eth16i.c	Wed Jan 30 00:00:41 2008 +1100
+++ b/drivers/net/eth16i.c	Wed Jan 30 00:02:08 2008 +1100
@@ -529,7 +529,7 @@ static int __init eth16i_probe1(struct n
 
 	/* Try to obtain interrupt vector */
 
-	if ((retval = request_irq(dev->irq, (void *)&eth16i_interrupt, 0, cardname, dev))) {
+	if ((retval = request_irq(dev->irq, eth16i_interrupt, 0, cardname, dev))) {
 		printk(KERN_WARNING "%s at %#3x, but is unusable due to conflicting IRQ %d.\n",
 		       cardname, ioaddr, dev->irq);
 		goto out;
diff -r 0de5002b2c73 drivers/net/ewrk3.c
--- a/drivers/net/ewrk3.c	Wed Jan 30 00:00:41 2008 +1100
+++ b/drivers/net/ewrk3.c	Wed Jan 30 00:02:08 2008 +1100
@@ -635,7 +635,7 @@ static int ewrk3_open(struct net_device 
 	STOP_EWRK3;
 
 	if (!lp->hard_strapped) {
-		if (request_irq(dev->irq, (void *) ewrk3_interrupt, 0, "ewrk3", dev)) {
+		if (request_irq(dev->irq, ewrk3_interrupt, 0, "ewrk3", dev)) {
 			printk("ewrk3_open(): Requested IRQ%d is busy\n", dev->irq);
 			status = -EAGAIN;
 		} else {
diff -r 0de5002b2c73 drivers/net/skfp/skfddi.c
--- a/drivers/net/skfp/skfddi.c	Wed Jan 30 00:00:41 2008 +1100
+++ b/drivers/net/skfp/skfddi.c	Wed Jan 30 00:02:08 2008 +1100
@@ -495,7 +495,7 @@ static int skfp_open(struct net_device *
 
 	PRINTK(KERN_INFO "entering skfp_open\n");
 	/* Register IRQ - support shared interrupts by passing device ptr */
-	err = request_irq(dev->irq, (void *) skfp_interrupt, IRQF_SHARED,
+	err = request_irq(dev->irq, skfp_interrupt, IRQF_SHARED,
 			  dev->name, dev);
 	if (err)
 		return err;
diff -r 0de5002b2c73 include/pcmcia/cs.h
--- a/include/pcmcia/cs.h	Wed Jan 30 00:00:41 2008 +1100
+++ b/include/pcmcia/cs.h	Wed Jan 30 00:02:08 2008 +1100
@@ -14,6 +14,7 @@
 
 #ifndef _LINUX_CS_H
 #define _LINUX_CS_H
+#include <linux/interrupt.h>
 
 /* For AccessConfigurationRegister */
 typedef struct conf_reg_t {
@@ -170,7 +171,7 @@ typedef struct irq_req_t {
     u_int	Attributes;
     u_int	AssignedIRQ;
     u_int	IRQInfo1, IRQInfo2; /* IRQInfo2 is ignored */
-    void	*Handler;
+    irq_handler_t Handler;
     void	*Instance;
 } irq_req_t;
 
diff -r 0de5002b2c73 sound/pci/als300.c
--- a/sound/pci/als300.c	Wed Jan 30 00:00:41 2008 +1100
+++ b/sound/pci/als300.c	Wed Jan 30 00:02:08 2008 +1100
@@ -678,7 +678,7 @@ static int __devinit snd_als300_create(s
 				       struct snd_als300 **rchip)
 {
 	struct snd_als300 *chip;
-	void *irq_handler;
+	irq_handler_t irq_handler;
 	int err;
 
 	static struct snd_device_ops ops = {