diff options
author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2013-02-27 10:38:18 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-03-07 09:58:46 -0500 |
commit | 4ba25d3f87fe3ed6634f61da2a6904e2dfd09192 (patch) | |
tree | d7c19c4e4664fbe95ab83d7c0947c621bc04d7e0 /drivers/hid | |
parent | 9684819b5a29e62acd8265a92d8f3454de9bb71e (diff) |
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.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 3af9efdd13d9..f712772437cb 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) | |||
909 | 909 | ||
910 | static int mt_resume(struct hid_device *hdev) | 910 | static int mt_resume(struct hid_device *hdev) |
911 | { | 911 | { |
912 | struct usb_interface *intf; | ||
913 | struct usb_host_interface *interface; | ||
914 | struct usb_device *dev; | ||
915 | |||
916 | if (hdev->bus != BUS_USB) | ||
917 | return 0; | ||
918 | |||
919 | intf = to_usb_interface(hdev->dev.parent); | ||
920 | interface = intf->cur_altsetting; | ||
921 | dev = interface_to_usbdev(intf); | ||
922 | |||
923 | /* Some Elan legacy devices require SET_IDLE to be set on resume. | 912 | /* Some Elan legacy devices require SET_IDLE to be set on resume. |
924 | * It should be safe to send it to other devices too. | 913 | * It should be safe to send it to other devices too. |
925 | * Tested on 3M, Stantum, Cypress, Zytronic, eGalax, and Elan panels. */ | 914 | * Tested on 3M, Stantum, Cypress, Zytronic, eGalax, and Elan panels. */ |
926 | 915 | ||
927 | usb_control_msg(dev, usb_sndctrlpipe(dev, 0), | 916 | hid_hw_idle(hdev, 0, 0, HID_REQ_SET_IDLE); |
928 | HID_REQ_SET_IDLE, | ||
929 | USB_TYPE_CLASS | USB_RECIP_INTERFACE, | ||
930 | 0, interface->desc.bInterfaceNumber, | ||
931 | NULL, 0, USB_CTRL_SET_TIMEOUT); | ||
932 | 917 | ||
933 | return 0; | 918 | return 0; |
934 | } | 919 | } |