diff options
Diffstat (limited to 'drivers/usb/input/ati_remote.c')
-rw-r--r-- | drivers/usb/input/ati_remote.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c index 3558d7ed99b9..f659f3028ad2 100644 --- a/drivers/usb/input/ati_remote.c +++ b/drivers/usb/input/ati_remote.c | |||
@@ -283,9 +283,9 @@ static void ati_remote_dump (unsigned char *data, unsigned int actual_length); | |||
283 | static int ati_remote_open (struct input_dev *inputdev); | 283 | static int ati_remote_open (struct input_dev *inputdev); |
284 | static void ati_remote_close (struct input_dev *inputdev); | 284 | static void ati_remote_close (struct input_dev *inputdev); |
285 | static int ati_remote_sendpacket (struct ati_remote *ati_remote, u16 cmd, unsigned char *data); | 285 | static int ati_remote_sendpacket (struct ati_remote *ati_remote, u16 cmd, unsigned char *data); |
286 | static void ati_remote_irq_out (struct urb *urb, struct pt_regs *regs); | 286 | static void ati_remote_irq_out (struct urb *urb); |
287 | static void ati_remote_irq_in (struct urb *urb, struct pt_regs *regs); | 287 | static void ati_remote_irq_in (struct urb *urb); |
288 | static void ati_remote_input_report (struct urb *urb, struct pt_regs *regs); | 288 | static void ati_remote_input_report (struct urb *urb); |
289 | static int ati_remote_initialize (struct ati_remote *ati_remote); | 289 | static int ati_remote_initialize (struct ati_remote *ati_remote); |
290 | static int ati_remote_probe (struct usb_interface *interface, const struct usb_device_id *id); | 290 | static int ati_remote_probe (struct usb_interface *interface, const struct usb_device_id *id); |
291 | static void ati_remote_disconnect (struct usb_interface *interface); | 291 | static void ati_remote_disconnect (struct usb_interface *interface); |
@@ -344,7 +344,7 @@ static void ati_remote_close(struct input_dev *inputdev) | |||
344 | /* | 344 | /* |
345 | * ati_remote_irq_out | 345 | * ati_remote_irq_out |
346 | */ | 346 | */ |
347 | static void ati_remote_irq_out(struct urb *urb, struct pt_regs *regs) | 347 | static void ati_remote_irq_out(struct urb *urb) |
348 | { | 348 | { |
349 | struct ati_remote *ati_remote = urb->context; | 349 | struct ati_remote *ati_remote = urb->context; |
350 | 350 | ||
@@ -453,7 +453,7 @@ static int ati_remote_compute_accel(struct ati_remote *ati_remote) | |||
453 | /* | 453 | /* |
454 | * ati_remote_report_input | 454 | * ati_remote_report_input |
455 | */ | 455 | */ |
456 | static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs) | 456 | static void ati_remote_input_report(struct urb *urb) |
457 | { | 457 | { |
458 | struct ati_remote *ati_remote = urb->context; | 458 | struct ati_remote *ati_remote = urb->context; |
459 | unsigned char *data= ati_remote->inbuf; | 459 | unsigned char *data= ati_remote->inbuf; |
@@ -491,7 +491,6 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs) | |||
491 | remote_num, data[1], data[2], index, ati_remote_tbl[index].code); | 491 | remote_num, data[1], data[2], index, ati_remote_tbl[index].code); |
492 | 492 | ||
493 | if (ati_remote_tbl[index].kind == KIND_LITERAL) { | 493 | if (ati_remote_tbl[index].kind == KIND_LITERAL) { |
494 | input_regs(dev, regs); | ||
495 | input_event(dev, ati_remote_tbl[index].type, | 494 | input_event(dev, ati_remote_tbl[index].type, |
496 | ati_remote_tbl[index].code, | 495 | ati_remote_tbl[index].code, |
497 | ati_remote_tbl[index].value); | 496 | ati_remote_tbl[index].value); |
@@ -520,7 +519,6 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs) | |||
520 | return; | 519 | return; |
521 | 520 | ||
522 | 521 | ||
523 | input_regs(dev, regs); | ||
524 | input_event(dev, ati_remote_tbl[index].type, | 522 | input_event(dev, ati_remote_tbl[index].type, |
525 | ati_remote_tbl[index].code, 1); | 523 | ati_remote_tbl[index].code, 1); |
526 | input_sync(dev); | 524 | input_sync(dev); |
@@ -537,7 +535,6 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs) | |||
537 | */ | 535 | */ |
538 | acc = ati_remote_compute_accel(ati_remote); | 536 | acc = ati_remote_compute_accel(ati_remote); |
539 | 537 | ||
540 | input_regs(dev, regs); | ||
541 | switch (ati_remote_tbl[index].kind) { | 538 | switch (ati_remote_tbl[index].kind) { |
542 | case KIND_ACCEL: | 539 | case KIND_ACCEL: |
543 | input_event(dev, ati_remote_tbl[index].type, | 540 | input_event(dev, ati_remote_tbl[index].type, |
@@ -575,14 +572,14 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs) | |||
575 | /* | 572 | /* |
576 | * ati_remote_irq_in | 573 | * ati_remote_irq_in |
577 | */ | 574 | */ |
578 | static void ati_remote_irq_in(struct urb *urb, struct pt_regs *regs) | 575 | static void ati_remote_irq_in(struct urb *urb) |
579 | { | 576 | { |
580 | struct ati_remote *ati_remote = urb->context; | 577 | struct ati_remote *ati_remote = urb->context; |
581 | int retval; | 578 | int retval; |
582 | 579 | ||
583 | switch (urb->status) { | 580 | switch (urb->status) { |
584 | case 0: /* success */ | 581 | case 0: /* success */ |
585 | ati_remote_input_report(urb, regs); | 582 | ati_remote_input_report(urb); |
586 | break; | 583 | break; |
587 | case -ECONNRESET: /* unlink */ | 584 | case -ECONNRESET: /* unlink */ |
588 | case -ENOENT: | 585 | case -ENOENT: |