diff options
| author | Jens Taprogge <jens.taprogge@taprogge.org> | 2012-09-12 14:55:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-12 09:56:01 -0700 |
| commit | faa75c406e7396a952c3ebedfc2b1d6f1b8d2648 (patch) | |
| tree | 499ad22c0e647f777fbcb5ba659f08add005b275 | |
| parent | 40733ed7636c6d255f7e6ad0b2bd66e8490fd22c (diff) | |
Staging: ipack: Let interrupts return irqreturn_t.
Signed-off-by: Jens Taprogge <jens.taprogge@taprogge.org>
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/ipack/bridges/tpci200.c | 2 | ||||
| -rw-r--r-- | drivers/staging/ipack/bridges/tpci200.h | 3 | ||||
| -rw-r--r-- | drivers/staging/ipack/devices/ipoctal.c | 2 | ||||
| -rw-r--r-- | drivers/staging/ipack/ipack.h | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/bridges/tpci200.c index b0d220521ccf..1a149d87bfa3 100644 --- a/drivers/staging/ipack/bridges/tpci200.c +++ b/drivers/staging/ipack/bridges/tpci200.c @@ -193,7 +193,7 @@ static int tpci200_free_irq(struct ipack_device *dev) } static int tpci200_request_irq(struct ipack_device *dev, int vector, - int (*handler)(void *), void *arg) + irqreturn_t (*handler)(void *), void *arg) { int res = 0; struct slot_irq *slot_irq; diff --git a/drivers/staging/ipack/bridges/tpci200.h b/drivers/staging/ipack/bridges/tpci200.h index b8e98268a598..2718d22a5dd2 100644 --- a/drivers/staging/ipack/bridges/tpci200.h +++ b/drivers/staging/ipack/bridges/tpci200.h @@ -17,7 +17,6 @@ #include <linux/limits.h> #include <linux/pci.h> #include <linux/spinlock.h> -#include <linux/interrupt.h> #include <linux/swab.h> #include <linux/io.h> @@ -123,7 +122,7 @@ struct tpci200_regs { struct slot_irq { struct ipack_device *holder; int vector; - int (*handler)(void *); + irqreturn_t (*handler)(void *); void *arg; }; diff --git a/drivers/staging/ipack/devices/ipoctal.c b/drivers/staging/ipack/devices/ipoctal.c index 4cc91730f34e..8e61ebd648ee 100644 --- a/drivers/staging/ipack/devices/ipoctal.c +++ b/drivers/staging/ipack/devices/ipoctal.c @@ -263,7 +263,7 @@ static void ipoctal_irq_channel(struct ipoctal_channel *channel) tty_kref_put(tty); } -static int ipoctal_irq_handler(void *arg) +static irqreturn_t ipoctal_irq_handler(void *arg) { unsigned int i; struct ipoctal *ipoctal = (struct ipoctal *) arg; diff --git a/drivers/staging/ipack/ipack.h b/drivers/staging/ipack/ipack.h index 0ea9d849e36e..9c3079d08e11 100644 --- a/drivers/staging/ipack/ipack.h +++ b/drivers/staging/ipack/ipack.h @@ -11,6 +11,7 @@ #include <linux/mod_devicetable.h> #include <linux/device.h> +#include <linux/interrupt.h> #include "ipack_ids.h" @@ -126,7 +127,8 @@ struct ipack_driver { struct ipack_bus_ops { int (*map_space) (struct ipack_device *dev, unsigned int memory_size, int space); int (*unmap_space) (struct ipack_device *dev, int space); - int (*request_irq) (struct ipack_device *dev, int vector, int (*handler)(void *), void *arg); + int (*request_irq) (struct ipack_device *dev, int vector, + irqreturn_t (*handler)(void *), void *arg); int (*free_irq) (struct ipack_device *dev); int (*get_clockrate) (struct ipack_device *dev); int (*set_clockrate) (struct ipack_device *dev, int mherz); |