diff options
Diffstat (limited to 'drivers/input/mouse/vsxxxaa.c')
-rw-r--r-- | drivers/input/mouse/vsxxxaa.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c index 47edcfd022ba..ffdb50eee93d 100644 --- a/drivers/input/mouse/vsxxxaa.c +++ b/drivers/input/mouse/vsxxxaa.c | |||
@@ -211,7 +211,7 @@ vsxxxaa_smells_like_packet (struct vsxxxaa *mouse, unsigned char type, size_t le | |||
211 | } | 211 | } |
212 | 212 | ||
213 | static void | 213 | static void |
214 | vsxxxaa_handle_REL_packet (struct vsxxxaa *mouse, struct pt_regs *regs) | 214 | vsxxxaa_handle_REL_packet (struct vsxxxaa *mouse) |
215 | { | 215 | { |
216 | struct input_dev *dev = mouse->dev; | 216 | struct input_dev *dev = mouse->dev; |
217 | unsigned char *buf = mouse->buf; | 217 | unsigned char *buf = mouse->buf; |
@@ -258,7 +258,6 @@ vsxxxaa_handle_REL_packet (struct vsxxxaa *mouse, struct pt_regs *regs) | |||
258 | /* | 258 | /* |
259 | * Report what we've found so far... | 259 | * Report what we've found so far... |
260 | */ | 260 | */ |
261 | input_regs (dev, regs); | ||
262 | input_report_key (dev, BTN_LEFT, left); | 261 | input_report_key (dev, BTN_LEFT, left); |
263 | input_report_key (dev, BTN_MIDDLE, middle); | 262 | input_report_key (dev, BTN_MIDDLE, middle); |
264 | input_report_key (dev, BTN_RIGHT, right); | 263 | input_report_key (dev, BTN_RIGHT, right); |
@@ -269,7 +268,7 @@ vsxxxaa_handle_REL_packet (struct vsxxxaa *mouse, struct pt_regs *regs) | |||
269 | } | 268 | } |
270 | 269 | ||
271 | static void | 270 | static void |
272 | vsxxxaa_handle_ABS_packet (struct vsxxxaa *mouse, struct pt_regs *regs) | 271 | vsxxxaa_handle_ABS_packet (struct vsxxxaa *mouse) |
273 | { | 272 | { |
274 | struct input_dev *dev = mouse->dev; | 273 | struct input_dev *dev = mouse->dev; |
275 | unsigned char *buf = mouse->buf; | 274 | unsigned char *buf = mouse->buf; |
@@ -312,7 +311,6 @@ vsxxxaa_handle_ABS_packet (struct vsxxxaa *mouse, struct pt_regs *regs) | |||
312 | /* | 311 | /* |
313 | * Report what we've found so far... | 312 | * Report what we've found so far... |
314 | */ | 313 | */ |
315 | input_regs (dev, regs); | ||
316 | input_report_key (dev, BTN_LEFT, left); | 314 | input_report_key (dev, BTN_LEFT, left); |
317 | input_report_key (dev, BTN_MIDDLE, middle); | 315 | input_report_key (dev, BTN_MIDDLE, middle); |
318 | input_report_key (dev, BTN_RIGHT, right); | 316 | input_report_key (dev, BTN_RIGHT, right); |
@@ -323,7 +321,7 @@ vsxxxaa_handle_ABS_packet (struct vsxxxaa *mouse, struct pt_regs *regs) | |||
323 | } | 321 | } |
324 | 322 | ||
325 | static void | 323 | static void |
326 | vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse, struct pt_regs *regs) | 324 | vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse) |
327 | { | 325 | { |
328 | struct input_dev *dev = mouse->dev; | 326 | struct input_dev *dev = mouse->dev; |
329 | unsigned char *buf = mouse->buf; | 327 | unsigned char *buf = mouse->buf; |
@@ -367,7 +365,6 @@ vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse, struct pt_regs *regs) | |||
367 | 365 | ||
368 | if (error <= 0x1f) { | 366 | if (error <= 0x1f) { |
369 | /* No (serious) error. Report buttons */ | 367 | /* No (serious) error. Report buttons */ |
370 | input_regs (dev, regs); | ||
371 | input_report_key (dev, BTN_LEFT, left); | 368 | input_report_key (dev, BTN_LEFT, left); |
372 | input_report_key (dev, BTN_MIDDLE, middle); | 369 | input_report_key (dev, BTN_MIDDLE, middle); |
373 | input_report_key (dev, BTN_RIGHT, right); | 370 | input_report_key (dev, BTN_RIGHT, right); |
@@ -395,7 +392,7 @@ vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse, struct pt_regs *regs) | |||
395 | } | 392 | } |
396 | 393 | ||
397 | static void | 394 | static void |
398 | vsxxxaa_parse_buffer (struct vsxxxaa *mouse, struct pt_regs *regs) | 395 | vsxxxaa_parse_buffer (struct vsxxxaa *mouse) |
399 | { | 396 | { |
400 | unsigned char *buf = mouse->buf; | 397 | unsigned char *buf = mouse->buf; |
401 | int stray_bytes; | 398 | int stray_bytes; |
@@ -432,7 +429,7 @@ vsxxxaa_parse_buffer (struct vsxxxaa *mouse, struct pt_regs *regs) | |||
432 | continue; | 429 | continue; |
433 | } | 430 | } |
434 | 431 | ||
435 | vsxxxaa_handle_REL_packet (mouse, regs); | 432 | vsxxxaa_handle_REL_packet (mouse); |
436 | continue; /* More to parse? */ | 433 | continue; /* More to parse? */ |
437 | } | 434 | } |
438 | 435 | ||
@@ -446,7 +443,7 @@ vsxxxaa_parse_buffer (struct vsxxxaa *mouse, struct pt_regs *regs) | |||
446 | continue; | 443 | continue; |
447 | } | 444 | } |
448 | 445 | ||
449 | vsxxxaa_handle_ABS_packet (mouse, regs); | 446 | vsxxxaa_handle_ABS_packet (mouse); |
450 | continue; /* More to parse? */ | 447 | continue; /* More to parse? */ |
451 | } | 448 | } |
452 | 449 | ||
@@ -460,7 +457,7 @@ vsxxxaa_parse_buffer (struct vsxxxaa *mouse, struct pt_regs *regs) | |||
460 | continue; | 457 | continue; |
461 | } | 458 | } |
462 | 459 | ||
463 | vsxxxaa_handle_POR_packet (mouse, regs); | 460 | vsxxxaa_handle_POR_packet (mouse); |
464 | continue; /* More to parse? */ | 461 | continue; /* More to parse? */ |
465 | } | 462 | } |
466 | 463 | ||
@@ -469,13 +466,12 @@ vsxxxaa_parse_buffer (struct vsxxxaa *mouse, struct pt_regs *regs) | |||
469 | } | 466 | } |
470 | 467 | ||
471 | static irqreturn_t | 468 | static irqreturn_t |
472 | vsxxxaa_interrupt (struct serio *serio, unsigned char data, unsigned int flags, | 469 | vsxxxaa_interrupt (struct serio *serio, unsigned char data, unsigned int flags) |
473 | struct pt_regs *regs) | ||
474 | { | 470 | { |
475 | struct vsxxxaa *mouse = serio_get_drvdata (serio); | 471 | struct vsxxxaa *mouse = serio_get_drvdata (serio); |
476 | 472 | ||
477 | vsxxxaa_queue_byte (mouse, data); | 473 | vsxxxaa_queue_byte (mouse, data); |
478 | vsxxxaa_parse_buffer (mouse, regs); | 474 | vsxxxaa_parse_buffer (mouse); |
479 | 475 | ||
480 | return IRQ_HANDLED; | 476 | return IRQ_HANDLED; |
481 | } | 477 | } |