Commit 90ea34be authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] pcips2.c compile fix

From: Vojtech Pavlik <vojtech@suse.cz>

- irq_return_t fixes

- remove obsolete pci_driver.driver bits
parent 4761c449
...@@ -58,10 +58,11 @@ static int pcips2_write(struct serio *io, unsigned char val) ...@@ -58,10 +58,11 @@ static int pcips2_write(struct serio *io, unsigned char val)
return 0; return 0;
} }
static void pcips2_interrupt(int irq, void *devid, struct pt_regs *regs) static irqreturn_t pcips2_interrupt(int irq, void *devid, struct pt_regs *regs)
{ {
struct pcips2_data *ps2if = devid; struct pcips2_data *ps2if = devid;
unsigned char status, scancode; unsigned char status, scancode;
int handled = 0;
do { do {
unsigned int flag; unsigned int flag;
...@@ -69,6 +70,7 @@ static void pcips2_interrupt(int irq, void *devid, struct pt_regs *regs) ...@@ -69,6 +70,7 @@ static void pcips2_interrupt(int irq, void *devid, struct pt_regs *regs)
status = inb(ps2if->base + PS2_STATUS); status = inb(ps2if->base + PS2_STATUS);
if (!(status & PS2_STAT_RXFULL)) if (!(status & PS2_STAT_RXFULL))
break; break;
handled = 1;
scancode = inb(ps2if->base + PS2_DATA); scancode = inb(ps2if->base + PS2_DATA);
if (status == 0xff && scancode == 0xff) if (status == 0xff && scancode == 0xff)
break; break;
...@@ -80,6 +82,7 @@ static void pcips2_interrupt(int irq, void *devid, struct pt_regs *regs) ...@@ -80,6 +82,7 @@ static void pcips2_interrupt(int irq, void *devid, struct pt_regs *regs)
serio_interrupt(&ps2if->io, scancode, flag, regs); serio_interrupt(&ps2if->io, scancode, flag, regs);
} while (1); } while (1);
return IRQ_RETVAL(handled);
} }
static void pcips2_flush_input(struct pcips2_data *ps2if) static void pcips2_flush_input(struct pcips2_data *ps2if)
...@@ -206,9 +209,6 @@ static struct pci_driver pcips2_driver = { ...@@ -206,9 +209,6 @@ static struct pci_driver pcips2_driver = {
.id_table = pcips2_ids, .id_table = pcips2_ids,
.probe = pcips2_probe, .probe = pcips2_probe,
.remove = __devexit_p(pcips2_remove), .remove = __devexit_p(pcips2_remove),
.driver = {
.devclass = &input_devclass,
},
}; };
static int __init pcips2_init(void) static int __init pcips2_init(void)
......
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