diff options
Diffstat (limited to 'drivers/input/serio/i8042.c')
-rw-r--r-- | drivers/input/serio/i8042.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 1bb0c76a9259..09b06e605b50 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c | |||
@@ -108,7 +108,7 @@ static unsigned char i8042_kbd_irq_registered; | |||
108 | static unsigned char i8042_aux_irq_registered; | 108 | static unsigned char i8042_aux_irq_registered; |
109 | static struct platform_device *i8042_platform_device; | 109 | static struct platform_device *i8042_platform_device; |
110 | 110 | ||
111 | static irqreturn_t i8042_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 111 | static irqreturn_t i8042_interrupt(int irq, void *dev_id); |
112 | 112 | ||
113 | /* | 113 | /* |
114 | * The i8042_wait_read() and i8042_wait_write functions wait for the i8042 to | 114 | * The i8042_wait_read() and i8042_wait_write functions wait for the i8042 to |
@@ -271,7 +271,7 @@ static int i8042_aux_write(struct serio *serio, unsigned char c) | |||
271 | * characters later. | 271 | * characters later. |
272 | */ | 272 | */ |
273 | 273 | ||
274 | i8042_interrupt(0, NULL, NULL); | 274 | i8042_interrupt(0, NULL); |
275 | return retval; | 275 | return retval; |
276 | } | 276 | } |
277 | 277 | ||
@@ -309,7 +309,7 @@ static void i8042_stop(struct serio *serio) | |||
309 | * to the upper layers. | 309 | * to the upper layers. |
310 | */ | 310 | */ |
311 | 311 | ||
312 | static irqreturn_t i8042_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 312 | static irqreturn_t i8042_interrupt(int irq, void *dev_id) |
313 | { | 313 | { |
314 | struct i8042_port *port; | 314 | struct i8042_port *port; |
315 | unsigned long flags; | 315 | unsigned long flags; |
@@ -379,7 +379,7 @@ static irqreturn_t i8042_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
379 | dfl & SERIO_TIMEOUT ? ", timeout" : ""); | 379 | dfl & SERIO_TIMEOUT ? ", timeout" : ""); |
380 | 380 | ||
381 | if (likely(port->exists)) | 381 | if (likely(port->exists)) |
382 | serio_interrupt(port->serio, data, dfl, regs); | 382 | serio_interrupt(port->serio, data, dfl); |
383 | 383 | ||
384 | ret = 1; | 384 | ret = 1; |
385 | out: | 385 | out: |
@@ -519,7 +519,7 @@ static int __devinit i8042_check_mux(void) | |||
519 | static struct completion i8042_aux_irq_delivered __devinitdata; | 519 | static struct completion i8042_aux_irq_delivered __devinitdata; |
520 | static int i8042_irq_being_tested __devinitdata; | 520 | static int i8042_irq_being_tested __devinitdata; |
521 | 521 | ||
522 | static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id, struct pt_regs *regs) | 522 | static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id) |
523 | { | 523 | { |
524 | unsigned long flags; | 524 | unsigned long flags; |
525 | unsigned char str, data; | 525 | unsigned char str, data; |
@@ -905,7 +905,7 @@ static int i8042_resume(struct platform_device *dev) | |||
905 | if (i8042_ports[I8042_KBD_PORT_NO].serio) | 905 | if (i8042_ports[I8042_KBD_PORT_NO].serio) |
906 | i8042_enable_kbd_port(); | 906 | i8042_enable_kbd_port(); |
907 | 907 | ||
908 | i8042_interrupt(0, NULL, NULL); | 908 | i8042_interrupt(0, NULL); |
909 | 909 | ||
910 | return 0; | 910 | return 0; |
911 | } | 911 | } |