From patchwork Thu Apr 16 00:22:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gerecke, Jason" X-Patchwork-Id: 6223501 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 8CD7ABF4A6 for ; Thu, 16 Apr 2015 00:23:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A9CDC20375 for ; Thu, 16 Apr 2015 00:23:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8715A20377 for ; Thu, 16 Apr 2015 00:23:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752508AbbDPAXj (ORCPT ); Wed, 15 Apr 2015 20:23:39 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:32885 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752051AbbDPAXi (ORCPT ); Wed, 15 Apr 2015 20:23:38 -0400 Received: by paboj16 with SMTP id oj16so68931470pab.0; Wed, 15 Apr 2015 17:23:38 -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; bh=e3+Wmehx8WgUdbXlG6yzIJbOpKNTS2y5/ROCxY/eyD4=; b=nzj9BgQtVMl6GeBF0l5QnO8RdWSGhF8wabTz3ik4vXCpLAgml/heBfbPKPX2bF+Aab 0PWrvKeCtlEhL0hOIXA0NMNWxdYSSviWD073Cz4XeQjjb9TqYEy9Ffga6IT1/N6NDW9s OKVvG1HpvVrUVPOZEkOVqEjT0+6yu39maFf/mrlx5wxdfYXP40RdwPodhRhpciqXNhY8 KhqeEARcjL25B9v6TKAMjGwyBH4b+xi4aggguFOxh0l5ErIn3+M/nQ5HdujSNHFIKzr+ 6x1w2My30AFA39fUIlJcmtmGmyYi3nqub+1ytMGsFOh9bRGVFgLhyWUp0cXQlURuqF7Y lFNw== X-Received: by 10.70.88.68 with SMTP id be4mr51637228pdb.97.1429143818511; Wed, 15 Apr 2015 17:23:38 -0700 (PDT) Received: from wacom-arch2.localdomain ([67.51.163.2]) by mx.google.com with ESMTPSA id rt12sm5246927pab.34.2015.04.15.17.23.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Apr 2015 17:23:37 -0700 (PDT) From: Jason Gerecke To: Jiri Kosina , Ping Cheng , Benjamin Tissoires Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Jason Gerecke , Jason Gerecke Subject: [PATCH] HID: wacom: Simplify check for presence of single-finger touch Date: Wed, 15 Apr 2015 17:22:32 -0700 Message-Id: <1429143752-5431-1-git-send-email-killertofu@gmail.com> X-Mailer: git-send-email 2.3.5 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 To determine if a touch is present in the single-touch case, we can simply check if the BTN_TOUCH key is active or not. This will work for both HID_GENERIC and other device types. Signed-off-by: Jason Gerecke --- drivers/hid/wacom_wac.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 69c7df7..2292d85 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -1072,9 +1072,8 @@ static int wacom_wac_finger_count_touches(struct wacom_wac *wacom) int count = 0; int i; - /* non-HID_GENERIC single touch input doesn't call this routine */ - if ((touch_max == 1) && (wacom->features.type == HID_GENERIC)) - return wacom->hid_data.tipswitch && + if (touch_max == 1) + return test_bit(BTN_TOUCH, input->key) && !wacom->shared->stylus_in_proximity; for (i = 0; i < input->mt->num_slots; i++) {