diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/input/serio/gscps2.c | |
parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/input/serio/gscps2.c')
-rw-r--r-- | drivers/input/serio/gscps2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index cde036a92168..74f14e097789 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c | |||
@@ -82,7 +82,7 @@ MODULE_DEVICE_TABLE(parisc, gscps2_device_tbl); | |||
82 | #define GSC_ID_MOUSE 1 | 82 | #define GSC_ID_MOUSE 1 |
83 | 83 | ||
84 | 84 | ||
85 | static irqreturn_t gscps2_interrupt(int irq, void *dev, struct pt_regs *regs); | 85 | static irqreturn_t gscps2_interrupt(int irq, void *dev); |
86 | 86 | ||
87 | #define BUFFER_SIZE 0x0f | 87 | #define BUFFER_SIZE 0x0f |
88 | 88 | ||
@@ -166,7 +166,7 @@ static inline int gscps2_writeb_output(struct gscps2port *ps2port, u8 data) | |||
166 | 166 | ||
167 | /* make sure any received data is returned as fast as possible */ | 167 | /* make sure any received data is returned as fast as possible */ |
168 | /* this is important e.g. when we set the LEDs on the keyboard */ | 168 | /* this is important e.g. when we set the LEDs on the keyboard */ |
169 | gscps2_interrupt(0, NULL, NULL); | 169 | gscps2_interrupt(0, NULL); |
170 | 170 | ||
171 | return 1; | 171 | return 1; |
172 | } | 172 | } |
@@ -226,7 +226,7 @@ static LIST_HEAD(ps2port_list); | |||
226 | * later. | 226 | * later. |
227 | */ | 227 | */ |
228 | 228 | ||
229 | static irqreturn_t gscps2_interrupt(int irq, void *dev, struct pt_regs *regs) | 229 | static irqreturn_t gscps2_interrupt(int irq, void *dev) |
230 | { | 230 | { |
231 | struct gscps2port *ps2port; | 231 | struct gscps2port *ps2port; |
232 | 232 | ||
@@ -267,7 +267,7 @@ static irqreturn_t gscps2_interrupt(int irq, void *dev, struct pt_regs *regs) | |||
267 | rxflags = ((status & GSC_STAT_TERR) ? SERIO_TIMEOUT : 0 ) | | 267 | rxflags = ((status & GSC_STAT_TERR) ? SERIO_TIMEOUT : 0 ) | |
268 | ((status & GSC_STAT_PERR) ? SERIO_PARITY : 0 ); | 268 | ((status & GSC_STAT_PERR) ? SERIO_PARITY : 0 ); |
269 | 269 | ||
270 | serio_interrupt(ps2port->port, data, rxflags, regs); | 270 | serio_interrupt(ps2port->port, data, rxflags); |
271 | 271 | ||
272 | } /* while() */ | 272 | } /* while() */ |
273 | 273 | ||
@@ -306,7 +306,7 @@ static int gscps2_open(struct serio *port) | |||
306 | /* enable it */ | 306 | /* enable it */ |
307 | gscps2_enable(ps2port, ENABLE); | 307 | gscps2_enable(ps2port, ENABLE); |
308 | 308 | ||
309 | gscps2_interrupt(0, NULL, NULL); | 309 | gscps2_interrupt(0, NULL); |
310 | 310 | ||
311 | return 0; | 311 | return 0; |
312 | } | 312 | } |