diff options
Diffstat (limited to 'drivers/usb/input/hid-core.c')
-rw-r--r-- | drivers/usb/input/hid-core.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index e0fd11605b43..a6738a83ff5b 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
@@ -780,13 +780,13 @@ static __inline__ int search(__s32 *array, __s32 value, unsigned n) | |||
780 | return -1; | 780 | return -1; |
781 | } | 781 | } |
782 | 782 | ||
783 | static void hid_process_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value, int interrupt, struct pt_regs *regs) | 783 | static void hid_process_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value, int interrupt) |
784 | { | 784 | { |
785 | hid_dump_input(usage, value); | 785 | hid_dump_input(usage, value); |
786 | if (hid->claimed & HID_CLAIMED_INPUT) | 786 | if (hid->claimed & HID_CLAIMED_INPUT) |
787 | hidinput_hid_event(hid, field, usage, value, regs); | 787 | hidinput_hid_event(hid, field, usage, value); |
788 | if (hid->claimed & HID_CLAIMED_HIDDEV && interrupt) | 788 | if (hid->claimed & HID_CLAIMED_HIDDEV && interrupt) |
789 | hiddev_hid_event(hid, field, usage, value, regs); | 789 | hiddev_hid_event(hid, field, usage, value); |
790 | } | 790 | } |
791 | 791 | ||
792 | /* | 792 | /* |
@@ -795,7 +795,7 @@ static void hid_process_event(struct hid_device *hid, struct hid_field *field, s | |||
795 | * reporting to the layer). | 795 | * reporting to the layer). |
796 | */ | 796 | */ |
797 | 797 | ||
798 | static void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data, int interrupt, struct pt_regs *regs) | 798 | static void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data, int interrupt) |
799 | { | 799 | { |
800 | unsigned n; | 800 | unsigned n; |
801 | unsigned count = field->report_count; | 801 | unsigned count = field->report_count; |
@@ -822,19 +822,19 @@ static void hid_input_field(struct hid_device *hid, struct hid_field *field, __u | |||
822 | for (n = 0; n < count; n++) { | 822 | for (n = 0; n < count; n++) { |
823 | 823 | ||
824 | if (HID_MAIN_ITEM_VARIABLE & field->flags) { | 824 | if (HID_MAIN_ITEM_VARIABLE & field->flags) { |
825 | hid_process_event(hid, field, &field->usage[n], value[n], interrupt, regs); | 825 | hid_process_event(hid, field, &field->usage[n], value[n], interrupt); |
826 | continue; | 826 | continue; |
827 | } | 827 | } |
828 | 828 | ||
829 | if (field->value[n] >= min && field->value[n] <= max | 829 | if (field->value[n] >= min && field->value[n] <= max |
830 | && field->usage[field->value[n] - min].hid | 830 | && field->usage[field->value[n] - min].hid |
831 | && search(value, field->value[n], count)) | 831 | && search(value, field->value[n], count)) |
832 | hid_process_event(hid, field, &field->usage[field->value[n] - min], 0, interrupt, regs); | 832 | hid_process_event(hid, field, &field->usage[field->value[n] - min], 0, interrupt); |
833 | 833 | ||
834 | if (value[n] >= min && value[n] <= max | 834 | if (value[n] >= min && value[n] <= max |
835 | && field->usage[value[n] - min].hid | 835 | && field->usage[value[n] - min].hid |
836 | && search(field->value, value[n], count)) | 836 | && search(field->value, value[n], count)) |
837 | hid_process_event(hid, field, &field->usage[value[n] - min], 1, interrupt, regs); | 837 | hid_process_event(hid, field, &field->usage[value[n] - min], 1, interrupt); |
838 | } | 838 | } |
839 | 839 | ||
840 | memcpy(field->value, value, count * sizeof(__s32)); | 840 | memcpy(field->value, value, count * sizeof(__s32)); |
@@ -842,7 +842,7 @@ exit: | |||
842 | kfree(value); | 842 | kfree(value); |
843 | } | 843 | } |
844 | 844 | ||
845 | static int hid_input_report(int type, struct urb *urb, int interrupt, struct pt_regs *regs) | 845 | static int hid_input_report(int type, struct urb *urb, int interrupt) |
846 | { | 846 | { |
847 | struct hid_device *hid = urb->context; | 847 | struct hid_device *hid = urb->context; |
848 | struct hid_report_enum *report_enum = hid->report_enum + type; | 848 | struct hid_report_enum *report_enum = hid->report_enum + type; |
@@ -892,7 +892,7 @@ static int hid_input_report(int type, struct urb *urb, int interrupt, struct pt_ | |||
892 | hiddev_report_event(hid, report); | 892 | hiddev_report_event(hid, report); |
893 | 893 | ||
894 | for (n = 0; n < report->maxfield; n++) | 894 | for (n = 0; n < report->maxfield; n++) |
895 | hid_input_field(hid, report->field[n], data, interrupt, regs); | 895 | hid_input_field(hid, report->field[n], data, interrupt); |
896 | 896 | ||
897 | if (hid->claimed & HID_CLAIMED_INPUT) | 897 | if (hid->claimed & HID_CLAIMED_INPUT) |
898 | hidinput_report_event(hid, report); | 898 | hidinput_report_event(hid, report); |
@@ -1004,7 +1004,7 @@ done: | |||
1004 | * Input interrupt completion handler. | 1004 | * Input interrupt completion handler. |
1005 | */ | 1005 | */ |
1006 | 1006 | ||
1007 | static void hid_irq_in(struct urb *urb, struct pt_regs *regs) | 1007 | static void hid_irq_in(struct urb *urb) |
1008 | { | 1008 | { |
1009 | struct hid_device *hid = urb->context; | 1009 | struct hid_device *hid = urb->context; |
1010 | int status; | 1010 | int status; |
@@ -1012,7 +1012,7 @@ static void hid_irq_in(struct urb *urb, struct pt_regs *regs) | |||
1012 | switch (urb->status) { | 1012 | switch (urb->status) { |
1013 | case 0: /* success */ | 1013 | case 0: /* success */ |
1014 | hid->retry_delay = 0; | 1014 | hid->retry_delay = 0; |
1015 | hid_input_report(HID_INPUT_REPORT, urb, 1, regs); | 1015 | hid_input_report(HID_INPUT_REPORT, urb, 1); |
1016 | break; | 1016 | break; |
1017 | case -ECONNRESET: /* unlink */ | 1017 | case -ECONNRESET: /* unlink */ |
1018 | case -ENOENT: | 1018 | case -ENOENT: |
@@ -1193,7 +1193,7 @@ static int hid_submit_ctrl(struct hid_device *hid) | |||
1193 | * Output interrupt completion handler. | 1193 | * Output interrupt completion handler. |
1194 | */ | 1194 | */ |
1195 | 1195 | ||
1196 | static void hid_irq_out(struct urb *urb, struct pt_regs *regs) | 1196 | static void hid_irq_out(struct urb *urb) |
1197 | { | 1197 | { |
1198 | struct hid_device *hid = urb->context; | 1198 | struct hid_device *hid = urb->context; |
1199 | unsigned long flags; | 1199 | unsigned long flags; |
@@ -1238,7 +1238,7 @@ static void hid_irq_out(struct urb *urb, struct pt_regs *regs) | |||
1238 | * Control pipe completion handler. | 1238 | * Control pipe completion handler. |
1239 | */ | 1239 | */ |
1240 | 1240 | ||
1241 | static void hid_ctrl(struct urb *urb, struct pt_regs *regs) | 1241 | static void hid_ctrl(struct urb *urb) |
1242 | { | 1242 | { |
1243 | struct hid_device *hid = urb->context; | 1243 | struct hid_device *hid = urb->context; |
1244 | unsigned long flags; | 1244 | unsigned long flags; |
@@ -1249,7 +1249,7 @@ static void hid_ctrl(struct urb *urb, struct pt_regs *regs) | |||
1249 | switch (urb->status) { | 1249 | switch (urb->status) { |
1250 | case 0: /* success */ | 1250 | case 0: /* success */ |
1251 | if (hid->ctrl[hid->ctrltail].dir == USB_DIR_IN) | 1251 | if (hid->ctrl[hid->ctrltail].dir == USB_DIR_IN) |
1252 | hid_input_report(hid->ctrl[hid->ctrltail].report->type, urb, 0, regs); | 1252 | hid_input_report(hid->ctrl[hid->ctrltail].report->type, urb, 0); |
1253 | break; | 1253 | break; |
1254 | case -ESHUTDOWN: /* unplug */ | 1254 | case -ESHUTDOWN: /* unplug */ |
1255 | unplug = 1; | 1255 | unplug = 1; |