Received: by 2002:a05:6a10:d5a5:0:0:0:0 with SMTP id gn37csp3202189pxb; Sat, 9 Oct 2021 04:40:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrIpai3npQpaxyI5w/HVHg0oETKqWjOx9bg3eKHrjP+57yqemqN6G4Wt0uSuwl68+c/W1y X-Received: by 2002:a63:1d63:: with SMTP id d35mr9163642pgm.238.1633779618453; Sat, 09 Oct 2021 04:40:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633779618; cv=none; d=google.com; s=arc-20160816; b=m0+sQpO0yJC02veZKVwPxPSZWdG/yiv3SEtMBNR9el0+nCuEFtWSLtGLzhOr1PVsmz RpqvpZW69BW5of5D9fpw1qSzyv9bBRULJE/BtWG3voxHS14MI92YZAzk+B0ld+3IHHxo 8HiMUiqYYit/RWaCfAyXz1ROIpqcdzH47nDlIB6/6mByr5UrS+HaBSCpZTZaSA308zA6 bU7HMnmvdcQim6TwAODVydkFfyMBSAJqAnkOUVzwmWuplWeD6I9cyxPtSkN9XMiwmVxS ea/kfPYuR2YPfXyl1K1uPo2iyWKNEoy09PW9FPSE0dr+H2O50Q9+d71yGglnKm3gM8De apKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=3mNRLjHegM/+zsOwmvU7YPcMf59k7n3IQSmcunFOm/k=; b=j5LvARyFjc48eHon31V5GYoALfEXhpE2NfgE0uFZVVjpStGNTOgFARnaJV9WmLRojN RoC0nURj6mHtCVc/vtOWCvMG1y5eA/iKhN6RcEtonxpGBLRFj+SE1DiO1fYWwWQ98L8k qbOHGZC2BXQTYCrM+ZOF6eWix2BB8Ybjpd+mL+S9lwrJJR9BG0KDRAJ2C87E8zFeCXyR NvF5nSwPAauOV6yrFuLkxCnQUzwzWhE44RLos17iBXdangFN5xMcjQ7yvvwKHRflA6RJ KLRDMGSdYbOjUQfQ6SZsl09uf3YwelcE+Su6jeSy+QnQud83v9wJJMIXbOpeNOIR4LUZ izXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alistair23.me header.s=fm2 header.b=2oUdJxfv; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=lAvxDR+0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j13si3356487pfj.113.2021.10.09.04.40.05; Sat, 09 Oct 2021 04:40:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@alistair23.me header.s=fm2 header.b=2oUdJxfv; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=lAvxDR+0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233008AbhJILjV (ORCPT + 99 others); Sat, 9 Oct 2021 07:39:21 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:38699 "EHLO wout2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232960AbhJILjS (ORCPT ); Sat, 9 Oct 2021 07:39:18 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 50DE63200DA8; Sat, 9 Oct 2021 07:37:21 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sat, 09 Oct 2021 07:37:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alistair23.me; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=3mNRLjHegM/+z sOwmvU7YPcMf59k7n3IQSmcunFOm/k=; b=2oUdJxfvt4ge/cMZKSPjZ42LwtUsl ijUvpLsPwFaih0hmZSt+N0oih+aUMjuYtsG6oCjup+D9+beLyg4tCrrH8GSf+2x4 h7g8POaDsmr0NBuHtUT2H12wW2Mdb2hjv99bgHhqG8WinR5+IPk3FTjY0OJue3y3 dw2zsKYK0zxsUDpzqHkj9TTwAGJLPyck6sAk1pTHII+CeNWeus+I2WOnOHgXOoVf 4NYnd4DdKQBgmUWtQpdmSbXhad7fLy8g5aWEWsAzNTFLOA1Ml2aeJm3piIHEFBHH XiEax6djYHgAzWEGNDK4b/kPC1MIDogaHqjtPFRcRtoY0JuKWStfRd7HQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=3mNRLjHegM/+zsOwmvU7YPcMf59k7n3IQSmcunFOm/k=; b=lAvxDR+0 3qGUQv+W5D9bnygahUXFVLlbRVaBUuu508MhZ20EUU4KOQuDlmXLCP+GxS20s+4N bxr1OFXmoMPxP76cHmOOjJO3AXPzGAPSE7pHenudP8qi/IgIz9+8XmIL++SqHzD2 o+qso7GSeSc/IHa6JVzzJZtmYpqlC6/qgHoICJSSL3KqZxrsVAxrsTjykU2irNFZ IdE9eNBR6+J2eiDZgrl77Zo1lAscUFFiEpAYwJAJyMVav64kdocSvpAEijrce+BL 1VrHFS6ykQX1dQbD8Uy7I+Rda4kxukL2xxk4Roi076iRIs159jiTXYUGq8TNmKpO Cf4M+MsxvLdNxA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrvddtvddggeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlihhsthgrihhrucfhrhgrnhgtihhsuceorghlihhsthgr ihhrsegrlhhishhtrghirhdvfedrmhgvqeenucggtffrrghtthgvrhhnpeeggedtteejke eggeeugfehueevudegvdetjeeviedugedvtdekffekhedtteduhfenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrlhhishhtrghirhesrghlih hsthgrihhrvdefrdhmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 9 Oct 2021 07:37:18 -0400 (EDT) From: Alistair Francis To: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: alistair@alistair23.me, alistair23@gmail.com Subject: [PATCH 2/2] Input: wacom_i2c - Use macros for the bit masks Date: Sat, 9 Oct 2021 21:37:07 +1000 Message-Id: <20211009113707.17568-2-alistair@alistair23.me> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211009113707.17568-1-alistair@alistair23.me> References: <20211009113707.17568-1-alistair@alistair23.me> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To make the code easier to read use macros for the bit masks. Signed-off-by: Alistair Francis --- drivers/input/touchscreen/wacom_i2c.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c index 8d7267ccc661..6865342db659 100644 --- a/drivers/input/touchscreen/wacom_i2c.c +++ b/drivers/input/touchscreen/wacom_i2c.c @@ -14,6 +14,12 @@ #include #include +// Bitmasks (for data[3]) +#define WACOM_TIP_SWITCH_bm (1 << 0) +#define WACOM_BARREL_SWITCH_bm (1 << 1) +#define WACOM_ERASER_bm (1 << 2) +#define WACOM_BARREL_SWITCH_2_bm (1 << 4) + // Registers #define WACOM_COMMAND_LSB 0x04 #define WACOM_COMMAND_MSB 0x00 @@ -110,10 +116,10 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id) if (error < 0) goto out; - tsw = data[3] & 0x01; - ers = data[3] & 0x04; - f1 = data[3] & 0x02; - f2 = data[3] & 0x10; + tsw = data[3] & WACOM_TIP_SWITCH_bm; + ers = data[3] & WACOM_ERASER_bm; + f1 = data[3] & WACOM_BARREL_SWITCH_bm; + f2 = data[3] & WACOM_BARREL_SWITCH_2_bm; x = le16_to_cpup((__le16 *)&data[4]); y = le16_to_cpup((__le16 *)&data[6]); pressure = le16_to_cpup((__le16 *)&data[8]); -- 2.31.1