[PATCH 23/39] input: kbd98io_interrupt should return irqreturn_t

Vojtech Pavlik
2004-06-07T12:23:11Z

ChangeSet@1.1587.27.3, 2004-05-10 01:25:24-05:00, dtor_core@ameritech.net
Input: kbd98io_interrupt should return irqreturn_t

98kbd-io.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

===================================================================

diff -Nru a/drivers/input/serio/98kbd-io.c b/drivers/input/serio/98kbd-io.c
--- a/drivers/input/serio/98kbd-io.c 2004-06-07 13:11:46 +02:00
+++ b/drivers/input/serio/98kbd-io.c 2004-06-07 13:11:46 +02:00
@@ -51,7 +51,7 @@
static struct serio kbd98_port;
extern struct pt_regs *kbd_pt_regs;

-static void kbd98io_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t kbd98io_interrupt(int irq, void *dev_id, struct pt_regs *regs);

/*
* kbd98_flush() flushes all data that may be in the keyboard buffers
@@ -143,7 +143,7 @@
* to the upper layers.
*/

-static void kbd98io_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t kbd98io_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
unsigned long flags;
unsigned char data;
@@ -154,6 +154,7 @@
spin_unlock_irqrestore(&kbd98io_lock, flags);
serio_interrupt(&kbd98_port, data, 0, regs);

+ return IRQ_HANDLED;
}

int __init kbd98io_init(void)