summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2013-02-27 16:38:18 +0100
committerJiri Kosina <jkosina@suse.cz>2013-03-07 15:58:46 +0100
commit4ba25d3f87fe3ed6634f61da2a6904e2dfd09192 (patch)
treed7c19c4e4664fbe95ab83d7c0947c621bc04d7e0 /drivers/hid
parent9684819b5a29e62acd8265a92d8f3454de9bb71e (diff)
downloadop-kernel-dev-4ba25d3f87fe3ed6634f61da2a6904e2dfd09192.zip
op-kernel-dev-4ba25d3f87fe3ed6634f61da2a6904e2dfd09192.tar.gz
HID: multitouch: remove last usb dependency
hid-multitouch used to direclty call for a set_idle in the .resume() callback. With the new hid_hw_idle(), this can be dropped and hid-multitouch is now freed from its transport layer. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Reviewed-by: David Herrmann <dh.herrmann@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-multitouch.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 3af9efd..f712772 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -909,26 +909,11 @@ static int mt_reset_resume(struct hid_device *hdev)
static int mt_resume(struct hid_device *hdev)
{
- struct usb_interface *intf;
- struct usb_host_interface *interface;
- struct usb_device *dev;
-
- if (hdev->bus != BUS_USB)
- return 0;
-
- intf = to_usb_interface(hdev->dev.parent);
- interface = intf->cur_altsetting;
- dev = interface_to_usbdev(intf);
-
/* Some Elan legacy devices require SET_IDLE to be set on resume.
* It should be safe to send it to other devices too.
* Tested on 3M, Stantum, Cypress, Zytronic, eGalax, and Elan panels. */
- usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
- HID_REQ_SET_IDLE,
- USB_TYPE_CLASS | USB_RECIP_INTERFACE,
- 0, interface->desc.bInterfaceNumber,
- NULL, 0, USB_CTRL_SET_TIMEOUT);
+ hid_hw_idle(hdev, 0, 0, HID_REQ_SET_IDLE);
return 0;
}
OpenPOWER on IntegriCloud