From patchwork Mon Feb 25 10:31:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 2180621 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id BCEB63FCA4 for ; Mon, 25 Feb 2013 10:33:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932272Ab3BYKc6 (ORCPT ); Mon, 25 Feb 2013 05:32:58 -0500 Received: from mail-wg0-f43.google.com ([74.125.82.43]:62805 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932231Ab3BYKcz (ORCPT ); Mon, 25 Feb 2013 05:32:55 -0500 Received: by mail-wg0-f43.google.com with SMTP id e12so2288360wge.10 for ; Mon, 25 Feb 2013 02:32:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=POrk9XB6FsZKT0PX9IBN34i4Brn+OsKKu4db6xZjvb8=; b=B54SU/0seOK/jgdFRyZ2MmXqk/9ll8GJgdvYEKr+bc8veLbYP1yxiq5iAwZwflH7va PNSc+Lz+YhSMzdvyybcb7uSUFG0PCXptM0hTGPJ//kxyyJAMJ7FBmDP2pv0/FvwR6LRg mhW7Sbh86XLEkFkzqjDvMpCfnW1hBkF9jLjF3AgcxtI1LgVTSFGb0a2H7ALUEY1/ulQa mvPLiXGIZc0hR6Dffwr/z5oxtBPQYK1Mxn6B0iVDCDcV5IjFFGA91IwuFNTZVtpdC+9l PYPZTmbOOCs+e2Rswc1JRyK8IXB+bRfBDEep/3v4nKP24f45EEBdFdmZgZeTBV1+Y+aK Ty2Q== X-Received: by 10.180.97.166 with SMTP id eb6mr10899016wib.20.1361788373985; Mon, 25 Feb 2013 02:32:53 -0800 (PST) Received: from localhost.localdomain.com (lan31-8-82-247-176-67.fbx.proxad.net. [82.247.176.67]) by mx.google.com with ESMTPS id fv2sm15624068wib.6.2013.02.25.02.32.52 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 25 Feb 2013 02:32:53 -0800 (PST) From: Benjamin Tissoires To: Benjamin Tissoires , Jiri Kosina , Stephane Chatty , Mika Westerberg , Henrik Rydberg , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/8] HID: multitouch: remove explicit usbhid dependency Date: Mon, 25 Feb 2013 11:31:48 +0100 Message-Id: <1361788310-6048-7-git-send-email-benjamin.tissoires@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1361788310-6048-1-git-send-email-benjamin.tissoires@gmail.com> References: <1361788310-6048-1-git-send-email-benjamin.tissoires@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org 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 Reviewed-by: Mika Westerberg --- 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 #include #include -#include "usbhid/usbhid.h" MODULE_AUTHOR("Stephane Chatty "); @@ -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.