diff options
| author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2013-02-25 11:31:47 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-02-25 13:26:41 +0100 |
| commit | b7966a4d7be0a10329f03330390f4bdaf453d74a (patch) | |
| tree | 73e1456d2199e16edf22af60929507ae25cff281 /drivers/hid/hid-picolcd_fb.c | |
| parent | d881427253da011495f4193663d809d0e9dfa215 (diff) | |
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-picolcd_fb.c')
| -rw-r--r-- | drivers/hid/hid-picolcd_fb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/hid-picolcd_fb.c b/drivers/hid/hid-picolcd_fb.c index 98f61de9a5e..591f6b22aa9 100644 --- a/drivers/hid/hid-picolcd_fb.c +++ b/drivers/hid/hid-picolcd_fb.c @@ -19,7 +19,6 @@ #include <linux/hid.h> #include <linux/vmalloc.h> -#include "usbhid/usbhid.h" #include <linux/fb.h> #include <linux/module.h> @@ -269,7 +268,7 @@ static void picolcd_fb_update(struct fb_info *info) mutex_unlock(&info->lock); if (!data) return; - usbhid_wait_io(data->hdev); + hid_hw_wait(data->hdev); mutex_lock(&info->lock); n = 0; } @@ -287,7 +286,7 @@ static void picolcd_fb_update(struct fb_info *info) spin_unlock_irqrestore(&fbdata->lock, flags); mutex_unlock(&info->lock); if (data) - usbhid_wait_io(data->hdev); + hid_hw_wait(data->hdev); return; } out: |