Commit ee26e236 authored by Cihangir Akturk's avatar Cihangir Akturk Committed by Greg Kroah-Hartman

staging: pi433: fix interrupt handler signatures

Remove "struct pt_regs *" parameter from interrupt handlers, since
it is no longer passed to interrupt handlers. Also, convert return
types to irqreturn_t.

Additionally, move DIO_irq_handler variable into the setup_GPIO
function, as it's not used outside of this function.
Signed-off-by: default avatarCihangir Akturk <cakturk@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19e60c42
...@@ -129,8 +129,7 @@ struct pi433_instance { ...@@ -129,8 +129,7 @@ struct pi433_instance {
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* GPIO interrupt handlers */ /* GPIO interrupt handlers */
static irq_handler_t static irqreturn_t DIO0_irq_handler(int irq, void *dev_id)
DIO0_irq_handler(unsigned int irq, void *dev_id, struct pt_regs *regs)
{ {
struct pi433_device *device = dev_id; struct pi433_device *device = dev_id;
...@@ -152,11 +151,10 @@ DIO0_irq_handler(unsigned int irq, void *dev_id, struct pt_regs *regs) ...@@ -152,11 +151,10 @@ DIO0_irq_handler(unsigned int irq, void *dev_id, struct pt_regs *regs)
wake_up_interruptible(&device->fifo_wait_queue); wake_up_interruptible(&device->fifo_wait_queue);
} }
return (irq_handler_t) IRQ_HANDLED; return IRQ_HANDLED;
} }
static irq_handler_t static irqreturn_t DIO1_irq_handler(int irq, void *dev_id)
DIO1_irq_handler(unsigned int irq, void *dev_id, struct pt_regs *regs)
{ {
struct pi433_device *device = dev_id; struct pi433_device *device = dev_id;
...@@ -172,14 +170,9 @@ DIO1_irq_handler(unsigned int irq, void *dev_id, struct pt_regs *regs) ...@@ -172,14 +170,9 @@ DIO1_irq_handler(unsigned int irq, void *dev_id, struct pt_regs *regs)
printk("DIO1 irq: %d bytes free in fifo\n", device->free_in_fifo); // TODO: printk() should include KERN_ facility level printk("DIO1 irq: %d bytes free in fifo\n", device->free_in_fifo); // TODO: printk() should include KERN_ facility level
wake_up_interruptible(&device->fifo_wait_queue); wake_up_interruptible(&device->fifo_wait_queue);
return (irq_handler_t) IRQ_HANDLED; return IRQ_HANDLED;
} }
static void *DIO_irq_handler[NUM_DIO] = {
DIO0_irq_handler,
DIO1_irq_handler
};
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static int static int
...@@ -982,6 +975,10 @@ static int setup_GPIOs(struct pi433_device *device) ...@@ -982,6 +975,10 @@ static int setup_GPIOs(struct pi433_device *device)
char name[5]; char name[5];
int retval; int retval;
int i; int i;
const irq_handler_t DIO_irq_handler[NUM_DIO] = {
DIO0_irq_handler,
DIO1_irq_handler
};
for (i=0; i<NUM_DIO; i++) for (i=0; i<NUM_DIO; i++)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment