diff options
author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2013-02-25 05:31:46 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-02-25 07:26:41 -0500 |
commit | d881427253da011495f4193663d809d0e9dfa215 (patch) | |
tree | fe4eb817ab712f7049b1d3ef675fec69d9207675 /drivers/hid/hid-zpff.c | |
parent | f3757cea18fadce23c95a4c4bc3123af73a95e65 (diff) |
HID: use hid_hw_request() instead of direct call to usbhid
This allows the hid drivers to be independent from the transport layer.
The patch was constructed by replacing all occurences of
usbhid_submit_report() by its hid_hw_request() counterpart.
Then, drivers not requiring USB_HID anymore have their USB_HID
dependency cleaned in the Kconfig file.
Finally, few drivers still depends on USB_HID. Many of them
are requiring the io wait callback. They are found in the next patch.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
For the sensor-hub part:
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-zpff.c')
-rw-r--r-- | drivers/hid/hid-zpff.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c index af66452592e9..6ec28a37c146 100644 --- a/drivers/hid/hid-zpff.c +++ b/drivers/hid/hid-zpff.c | |||
@@ -24,13 +24,11 @@ | |||
24 | #include <linux/hid.h> | 24 | #include <linux/hid.h> |
25 | #include <linux/input.h> | 25 | #include <linux/input.h> |
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | #include <linux/usb.h> | ||
28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
29 | 28 | ||
30 | #include "hid-ids.h" | 29 | #include "hid-ids.h" |
31 | 30 | ||
32 | #ifdef CONFIG_ZEROPLUS_FF | 31 | #ifdef CONFIG_ZEROPLUS_FF |
33 | #include "usbhid/usbhid.h" | ||
34 | 32 | ||
35 | struct zpff_device { | 33 | struct zpff_device { |
36 | struct hid_report *report; | 34 | struct hid_report *report; |
@@ -59,7 +57,7 @@ static int zpff_play(struct input_dev *dev, void *data, | |||
59 | zpff->report->field[2]->value[0] = left; | 57 | zpff->report->field[2]->value[0] = left; |
60 | zpff->report->field[3]->value[0] = right; | 58 | zpff->report->field[3]->value[0] = right; |
61 | dbg_hid("running with 0x%02x 0x%02x\n", left, right); | 59 | dbg_hid("running with 0x%02x 0x%02x\n", left, right); |
62 | usbhid_submit_report(hid, zpff->report, USB_DIR_OUT); | 60 | hid_hw_request(hid, zpff->report, HID_REQ_SET_REPORT); |
63 | 61 | ||
64 | return 0; | 62 | return 0; |
65 | } | 63 | } |
@@ -104,7 +102,7 @@ static int zpff_init(struct hid_device *hid) | |||
104 | zpff->report->field[1]->value[0] = 0x02; | 102 | zpff->report->field[1]->value[0] = 0x02; |
105 | zpff->report->field[2]->value[0] = 0x00; | 103 | zpff->report->field[2]->value[0] = 0x00; |
106 | zpff->report->field[3]->value[0] = 0x00; | 104 | zpff->report->field[3]->value[0] = 0x00; |
107 | usbhid_submit_report(hid, zpff->report, USB_DIR_OUT); | 105 | hid_hw_request(hid, zpff->report, HID_REQ_SET_REPORT); |
108 | 106 | ||
109 | hid_info(hid, "force feedback for Zeroplus based devices by Anssi Hannula <anssi.hannula@gmail.com>\n"); | 107 | hid_info(hid, "force feedback for Zeroplus based devices by Anssi Hannula <anssi.hannula@gmail.com>\n"); |
110 | 108 | ||