[PATCH v2 6/8] HID: multitouch: remove explicit usbhid dependency

From: Benjamin Tissoires
Date: Mon Feb 25 2013 - 05:33:03 EST

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@xxxxxxxxx>
Reviewed-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
drivers/hid/hid-multitouch.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 32258ba..184ac0a 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -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@xxxxxxx>");
@@ -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.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/