summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-ntrig.c
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@gmail.com>2013-02-25 11:31:47 +0100
committerJiri Kosina <jkosina@suse.cz>2013-02-25 13:26:41 +0100
commitb7966a4d7be0a10329f03330390f4bdaf453d74a (patch)
tree73e1456d2199e16edf22af60929507ae25cff281 /drivers/hid/hid-ntrig.c
parentHID: use hid_hw_request() instead of direct call to usbhid (diff)
downloadlinux-b7966a4d7be0a10329f03330390f4bdaf453d74a.tar.xz
linux-b7966a4d7be0a10329f03330390f4bdaf453d74a.zip
HID: use hid_hw_wait() instead of direct call to usbhid
This removes most of the dependencies between hid drivers and usbhid. The patch was constructed by replacing all occurences of usbhid_wait_io() by its hid_hw_wait() counterpart. Then, drivers not requiring USB_HID anymore have their USB_HID dependency cleaned in the Kconfig file. As of today, few drivers are still requiring an explicit USB layer dependency: * ntrig (a patch is on its way) * multitouch (one patch following and another on its way) * lenovo tpkbd * roccat * sony The last three are two deeply using direct calls to the usb subsystem to be able to be cleaned right now. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Reviewed-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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c
index b926592e6c16..ef95102515e4 100644
--- a/drivers/hid/hid-ntrig.c
+++ b/drivers/hid/hid-ntrig.c
@@ -119,7 +119,7 @@ static inline int ntrig_get_mode(struct hid_device *hdev)
return -EINVAL;
hid_hw_request(hdev, report, HID_REQ_GET_REPORT);
- usbhid_wait_io(hdev);
+ hid_hw_wait(hdev);
return (int)report->field[0]->value[0];
}
@@ -937,7 +937,7 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id)
if (report) {
/* Let the device settle to ensure the wakeup message gets
* through */
- usbhid_wait_io(hdev);
+ hid_hw_wait(hdev);
hid_hw_request(hdev, report, HID_REQ_GET_REPORT);
/*