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>
This commit is contained in:
parent
40733ed763
commit
faa75c406e
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue