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-ntrig.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-ntrig.c')
-rw-r--r-- | drivers/hid/hid-ntrig.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index 7757e82416e7..b926592e6c16 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c | |||
@@ -118,7 +118,7 @@ static inline int ntrig_get_mode(struct hid_device *hdev) | |||
118 | if (!report) | 118 | if (!report) |
119 | return -EINVAL; | 119 | return -EINVAL; |
120 | 120 | ||
121 | usbhid_submit_report(hdev, report, USB_DIR_IN); | 121 | hid_hw_request(hdev, report, HID_REQ_GET_REPORT); |
122 | usbhid_wait_io(hdev); | 122 | usbhid_wait_io(hdev); |
123 | return (int)report->field[0]->value[0]; | 123 | return (int)report->field[0]->value[0]; |
124 | } | 124 | } |
@@ -137,7 +137,7 @@ static inline void ntrig_set_mode(struct hid_device *hdev, const int mode) | |||
137 | if (!report) | 137 | if (!report) |
138 | return; | 138 | return; |
139 | 139 | ||
140 | usbhid_submit_report(hdev, report, USB_DIR_IN); | 140 | hid_hw_request(hdev, report, HID_REQ_GET_REPORT); |
141 | } | 141 | } |
142 | 142 | ||
143 | static void ntrig_report_version(struct hid_device *hdev) | 143 | static void ntrig_report_version(struct hid_device *hdev) |
@@ -938,7 +938,7 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) | |||
938 | /* Let the device settle to ensure the wakeup message gets | 938 | /* Let the device settle to ensure the wakeup message gets |
939 | * through */ | 939 | * through */ |
940 | usbhid_wait_io(hdev); | 940 | usbhid_wait_io(hdev); |
941 | usbhid_submit_report(hdev, report, USB_DIR_IN); | 941 | hid_hw_request(hdev, report, HID_REQ_GET_REPORT); |
942 | 942 | ||
943 | /* | 943 | /* |
944 | * Sanity check: if the current mode is invalid reset it to | 944 | * Sanity check: if the current mode is invalid reset it to |