diff options
Diffstat (limited to 'drivers/usb/input/aiptek.c')
-rw-r--r-- | drivers/usb/input/aiptek.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/usb/input/aiptek.c b/drivers/usb/input/aiptek.c index b138dae2b055..bf428184608f 100644 --- a/drivers/usb/input/aiptek.c +++ b/drivers/usb/input/aiptek.c | |||
@@ -396,7 +396,7 @@ static int aiptek_convert_from_2s_complement(unsigned char c) | |||
396 | * replaced with the input_sync() method (which emits EV_SYN.) | 396 | * replaced with the input_sync() method (which emits EV_SYN.) |
397 | */ | 397 | */ |
398 | 398 | ||
399 | static void aiptek_irq(struct urb *urb, struct pt_regs *regs) | 399 | static void aiptek_irq(struct urb *urb) |
400 | { | 400 | { |
401 | struct aiptek *aiptek = urb->context; | 401 | struct aiptek *aiptek = urb->context; |
402 | unsigned char *data = aiptek->data; | 402 | unsigned char *data = aiptek->data; |
@@ -442,8 +442,6 @@ static void aiptek_irq(struct urb *urb, struct pt_regs *regs) | |||
442 | aiptek->diagnostic = | 442 | aiptek->diagnostic = |
443 | AIPTEK_DIAGNOSTIC_SENDING_RELATIVE_IN_ABSOLUTE; | 443 | AIPTEK_DIAGNOSTIC_SENDING_RELATIVE_IN_ABSOLUTE; |
444 | } else { | 444 | } else { |
445 | input_regs(inputdev, regs); | ||
446 | |||
447 | x = aiptek_convert_from_2s_complement(data[2]); | 445 | x = aiptek_convert_from_2s_complement(data[2]); |
448 | y = aiptek_convert_from_2s_complement(data[3]); | 446 | y = aiptek_convert_from_2s_complement(data[3]); |
449 | 447 | ||
@@ -488,8 +486,6 @@ static void aiptek_irq(struct urb *urb, struct pt_regs *regs) | |||
488 | (aiptek->curSetting.pointerMode)) { | 486 | (aiptek->curSetting.pointerMode)) { |
489 | aiptek->diagnostic = AIPTEK_DIAGNOSTIC_TOOL_DISALLOWED; | 487 | aiptek->diagnostic = AIPTEK_DIAGNOSTIC_TOOL_DISALLOWED; |
490 | } else { | 488 | } else { |
491 | input_regs(inputdev, regs); | ||
492 | |||
493 | x = le16_to_cpu(get_unaligned((__le16 *) (data + 1))); | 489 | x = le16_to_cpu(get_unaligned((__le16 *) (data + 1))); |
494 | y = le16_to_cpu(get_unaligned((__le16 *) (data + 3))); | 490 | y = le16_to_cpu(get_unaligned((__le16 *) (data + 3))); |
495 | z = le16_to_cpu(get_unaligned((__le16 *) (data + 6))); | 491 | z = le16_to_cpu(get_unaligned((__le16 *) (data + 6))); |
@@ -568,7 +564,6 @@ static void aiptek_irq(struct urb *urb, struct pt_regs *regs) | |||
568 | (aiptek->curSetting.pointerMode)) { | 564 | (aiptek->curSetting.pointerMode)) { |
569 | aiptek->diagnostic = AIPTEK_DIAGNOSTIC_TOOL_DISALLOWED; | 565 | aiptek->diagnostic = AIPTEK_DIAGNOSTIC_TOOL_DISALLOWED; |
570 | } else { | 566 | } else { |
571 | input_regs(inputdev, regs); | ||
572 | x = le16_to_cpu(get_unaligned((__le16 *) (data + 1))); | 567 | x = le16_to_cpu(get_unaligned((__le16 *) (data + 1))); |
573 | y = le16_to_cpu(get_unaligned((__le16 *) (data + 3))); | 568 | y = le16_to_cpu(get_unaligned((__le16 *) (data + 3))); |
574 | 569 | ||
@@ -631,8 +626,6 @@ static void aiptek_irq(struct urb *urb, struct pt_regs *regs) | |||
631 | z = le16_to_cpu(get_unaligned((__le16 *) (data + 4))); | 626 | z = le16_to_cpu(get_unaligned((__le16 *) (data + 4))); |
632 | 627 | ||
633 | if (dv != 0) { | 628 | if (dv != 0) { |
634 | input_regs(inputdev, regs); | ||
635 | |||
636 | /* If we've not already sent a tool_button_?? code, do | 629 | /* If we've not already sent a tool_button_?? code, do |
637 | * so now. Then set FIRED_BIT so it won't be resent unless | 630 | * so now. Then set FIRED_BIT so it won't be resent unless |
638 | * the user forces FIRED_BIT off. | 631 | * the user forces FIRED_BIT off. |
@@ -681,8 +674,6 @@ static void aiptek_irq(struct urb *urb, struct pt_regs *regs) | |||
681 | macro = data[3]; | 674 | macro = data[3]; |
682 | 675 | ||
683 | if (dv != 0) { | 676 | if (dv != 0) { |
684 | input_regs(inputdev, regs); | ||
685 | |||
686 | /* If we've not already sent a tool_button_?? code, do | 677 | /* If we've not already sent a tool_button_?? code, do |
687 | * so now. Then set FIRED_BIT so it won't be resent unless | 678 | * so now. Then set FIRED_BIT so it won't be resent unless |
688 | * the user forces FIRED_BIT off. | 679 | * the user forces FIRED_BIT off. |
@@ -726,8 +717,6 @@ static void aiptek_irq(struct urb *urb, struct pt_regs *regs) | |||
726 | */ | 717 | */ |
727 | else if (data[0] == 6) { | 718 | else if (data[0] == 6) { |
728 | macro = le16_to_cpu(get_unaligned((__le16 *) (data + 1))); | 719 | macro = le16_to_cpu(get_unaligned((__le16 *) (data + 1))); |
729 | input_regs(inputdev, regs); | ||
730 | |||
731 | if (macro > 0) { | 720 | if (macro > 0) { |
732 | input_report_key(inputdev, macroKeyEvents[macro - 1], | 721 | input_report_key(inputdev, macroKeyEvents[macro - 1], |
733 | 0); | 722 | 0); |