]> Pileus Git - ~andy/linux/commitdiff
HID: multitouch: remove explicit usbhid dependency
authorBenjamin Tissoires <benjamin.tissoires@gmail.com>
Mon, 25 Feb 2013 10:31:48 +0000 (11:31 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 25 Feb 2013 12:26:41 +0000 (13:26 +0100)
This patch is part of the cleanup of the HID drivers
against their low-level transport layer.
With new touchscreens relying on I2C, it's better to
handle now these dependencies before users get kernel oopses.

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>
drivers/hid/hid-multitouch.c

index 32258ba60056133850584ecf228f9577e0368270..184ac0a42121e2769680e6aed1b2425b751abb37 100644 (file)
@@ -32,7 +32,6 @@
 #include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/input/mt.h>
-#include "usbhid/usbhid.h"
 
 
 MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>");
@@ -907,7 +906,7 @@ static int mt_resume(struct hid_device *hdev)
 
        intf = to_usb_interface(hdev->dev.parent);
        interface = intf->cur_altsetting;
-       dev = hid_to_usb_dev(hdev);
+       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.