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-lgff.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-lgff.c')
-rw-r--r-- | drivers/hid/hid-lgff.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/hid/hid-lgff.c b/drivers/hid/hid-lgff.c index 27bc54f92f44..d7ea8c845b40 100644 --- a/drivers/hid/hid-lgff.c +++ b/drivers/hid/hid-lgff.c | |||
@@ -30,10 +30,8 @@ | |||
30 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | 30 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
31 | 31 | ||
32 | #include <linux/input.h> | 32 | #include <linux/input.h> |
33 | #include <linux/usb.h> | ||
34 | #include <linux/hid.h> | 33 | #include <linux/hid.h> |
35 | 34 | ||
36 | #include "usbhid/usbhid.h" | ||
37 | #include "hid-lg.h" | 35 | #include "hid-lg.h" |
38 | 36 | ||
39 | struct dev_type { | 37 | struct dev_type { |
@@ -89,7 +87,7 @@ static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *ef | |||
89 | report->field[0]->value[2] = x; | 87 | report->field[0]->value[2] = x; |
90 | report->field[0]->value[3] = y; | 88 | report->field[0]->value[3] = y; |
91 | dbg_hid("(x, y)=(%04x, %04x)\n", x, y); | 89 | dbg_hid("(x, y)=(%04x, %04x)\n", x, y); |
92 | usbhid_submit_report(hid, report, USB_DIR_OUT); | 90 | hid_hw_request(hid, report, HID_REQ_SET_REPORT); |
93 | break; | 91 | break; |
94 | 92 | ||
95 | case FF_RUMBLE: | 93 | case FF_RUMBLE: |
@@ -104,7 +102,7 @@ static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *ef | |||
104 | report->field[0]->value[2] = left; | 102 | report->field[0]->value[2] = left; |
105 | report->field[0]->value[3] = right; | 103 | report->field[0]->value[3] = right; |
106 | dbg_hid("(left, right)=(%04x, %04x)\n", left, right); | 104 | dbg_hid("(left, right)=(%04x, %04x)\n", left, right); |
107 | usbhid_submit_report(hid, report, USB_DIR_OUT); | 105 | hid_hw_request(hid, report, HID_REQ_SET_REPORT); |
108 | break; | 106 | break; |
109 | } | 107 | } |
110 | return 0; | 108 | return 0; |
@@ -124,7 +122,7 @@ static void hid_lgff_set_autocenter(struct input_dev *dev, u16 magnitude) | |||
124 | *value++ = 0x80; | 122 | *value++ = 0x80; |
125 | *value++ = 0x00; | 123 | *value++ = 0x00; |
126 | *value = 0x00; | 124 | *value = 0x00; |
127 | usbhid_submit_report(hid, report, USB_DIR_OUT); | 125 | hid_hw_request(hid, report, HID_REQ_SET_REPORT); |
128 | } | 126 | } |
129 | 127 | ||
130 | int lgff_init(struct hid_device* hid) | 128 | int lgff_init(struct hid_device* hid) |