From patchwork Mon Aug 3 17:17:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gerecke, Jason" X-Patchwork-Id: 6931991 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2FC5EC05AC for ; Mon, 3 Aug 2015 17:17:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 398B52039E for ; Mon, 3 Aug 2015 17:17:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3171020611 for ; Mon, 3 Aug 2015 17:17:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754633AbbHCRRV (ORCPT ); Mon, 3 Aug 2015 13:17:21 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:34462 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754548AbbHCRRU (ORCPT ); Mon, 3 Aug 2015 13:17:20 -0400 Received: by pawu10 with SMTP id u10so17182489paw.1 for ; Mon, 03 Aug 2015 10:17:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=W8GRaEfk+ULzcFf95+gt+yEM/jWXfkABtMZNGoU7q64=; b=lUeMvqY8d1OBEbraecm5YlqsPQNUA6MoJHlDdwLnq3sdn/LwY/TaQwf9nA439mQrm6 mOwpWJYh+pq7faC9A4pulHENhZ/c1NHdkOzZz9kObd+9kh3obxKDpQMBFXgrzVtaJmIU NJBTS5vvTgeNs79FnDex0sXroC5Ehj9D1hAl+E+gwNAl712g3WAFbMVihlG+v6jUp+1S zUMSZ6GG+52ga4rPRLhJgV09h5eQlXHZhk3u98m3d9FbsM3Nz7qBjbJie1Y8O9cbte8u +GKCtSImdVWRsilrTiH1MXuoN0fybVjbRln8/ilVtUGKhmKGVnlno+LpEJjiHiwXF9Tz Aj1g== X-Received: by 10.68.88.69 with SMTP id be5mr25686289pbb.105.1438622240442; Mon, 03 Aug 2015 10:17:20 -0700 (PDT) Received: from wacom-arch2.localdomain ([67.51.163.2]) by smtp.gmail.com with ESMTPSA id 2sm3161330pdw.22.2015.08.03.10.17.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Aug 2015 10:17:19 -0700 (PDT) From: Jason Gerecke To: Jiri Kosina , Benjamin Tissoires Cc: Aaron Skomra , Ping Cheng , linux-input@vger.kernel.org, Jason Gerecke , Jason Gerecke Subject: [PATCH 2/3] HID: wacom: Replace WACOM_QUIRK_MONITOR with WACOM_DEVICETYPE_WL_MONITOR Date: Mon, 3 Aug 2015 10:17:04 -0700 Message-Id: <1438622225-6718-2-git-send-email-killertofu@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438622225-6718-1-git-send-email-killertofu@gmail.com> References: <1438622225-6718-1-git-send-email-killertofu@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The monitor interface on the wireless receiver is more logically expressed as a type of device instead of a quirk. Signed-off-by: Jason Gerecke --- drivers/hid/wacom_sys.c | 6 +++--- drivers/hid/wacom_wac.c | 4 +--- drivers/hid/wacom_wac.h | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index a334332..13834ba 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -454,7 +454,7 @@ static void wacom_retrieve_hid_descriptor(struct hid_device *hdev, */ if (features->type == WIRELESS) { if (intf->cur_altsetting->desc.bInterfaceNumber == 0) { - features->device_type = WACOM_DEVICETYPE_NONE; + features->device_type = WACOM_DEVICETYPE_WL_MONITOR; } else if (intf->cur_altsetting->desc.bInterfaceNumber == 2) { features->device_type |= WACOM_DEVICETYPE_TOUCH; } @@ -1581,7 +1581,7 @@ static int wacom_probe(struct hid_device *hdev, if (error) goto fail_shared_data; - if (!(features->quirks & WACOM_QUIRK_MONITOR) && + if (!(features->device_type & WACOM_DEVICETYPE_WL_MONITOR) && (features->quirks & WACOM_QUIRK_BATTERY)) { error = wacom_initialize_battery(wacom); if (error) @@ -1615,7 +1615,7 @@ static int wacom_probe(struct hid_device *hdev, /* Note that if query fails it is not a hard failure */ wacom_query_tablet_data(hdev, features); - if (features->quirks & WACOM_QUIRK_MONITOR) + if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR) error = hid_hw_open(hdev); if (wacom_wac->features.type == INTUOSHT && diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 280deb2..82bb0d3 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -2330,9 +2330,7 @@ void wacom_setup_device_quirks(struct wacom *wacom) /* monitor never has input and pen/touch have delayed create */ features->quirks |= WACOM_QUIRK_NO_INPUT; - /* must be monitor interface if no device_type set */ - if (features->device_type == WACOM_DEVICETYPE_NONE) { - features->quirks |= WACOM_QUIRK_MONITOR; + if (features->device_type == WACOM_DEVICETYPE_WL_MONITOR) { features->quirks |= WACOM_QUIRK_BATTERY; } } diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index c245a66..87df674 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -69,7 +69,6 @@ /* device quirks */ #define WACOM_QUIRK_BBTOUCH_LOWRES 0x0001 #define WACOM_QUIRK_NO_INPUT 0x0002 -#define WACOM_QUIRK_MONITOR 0x0004 #define WACOM_QUIRK_BATTERY 0x0008 /* device types */ @@ -77,6 +76,7 @@ #define WACOM_DEVICETYPE_PEN 0x0001 #define WACOM_DEVICETYPE_TOUCH 0x0002 #define WACOM_DEVICETYPE_PAD 0x0004 +#define WACOM_DEVICETYPE_WL_MONITOR 0x0008 #define WACOM_VENDORDEFINED_PEN 0xff0d0001