[10/15] usb: typec: tcpm/tcpci_maxim: drop STATUS_CHECK()

Message ID	20240710-tcpc-cleanup-v1-10-0ec1f41f4263@linaro.org
State	New
Headers	show Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7046A193077 for <linux-usb@vger.kernel.org>; Wed, 10 Jul 2024 10:36:30 +0000 (UTC) From: =?utf-8?q?Andr=C3=A9_Draszik?= <andre.draszik@linaro.org> Date: Wed, 10 Jul 2024 11:36:17 +0100 Subject: [PATCH 10/15] usb: typec: tcpm/tcpci_maxim: drop STATUS_CHECK() Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20240710-tcpc-cleanup-v1-10-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus <heikki.krogerus@linux.intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Peter Griffin <peter.griffin@linaro.org>, Tudor Ambarus <tudor.ambarus@linaro.org>, Will McVicker <willmcvicker@google.com>, Badhri Jagan Sridharan <badhri@google.com>, kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr?= =?utf-8?q?=C3=A9_Draszik?= <andre.draszik@linaro.org>
Series	usb: typec: tcpci: few TCPCi & TCPCi-Maxim cleanups (mostly genmask()) \| expand [00/15] usb: typec: tcpci: few TCPCi & TCPCi-Maxim cleanups (mostly genmask()) [01/15] usb: typec: tcpci: fix a comment typo [02/15] usb: typec: tcpm/tcpci_maxim: clarify a comment [03/15] usb: typec: tcpci: use GENMASK() for TCPC_CC_STATUS_CC[12] [04/15] usb: typec: tcpci: use GENMASK() for TCPC_ROLE_CTRL_CC[12] [05/15] usb: typec: tcpci: use GENMASK() for TCPC_ROLE_CTRL_RP_VAL [06/15] usb: typec: tcpci: use GENMASK() for TCPC_MSG_HDR_INFO_REV [07/15] usb: typec: tcpci: use GENMASK() for TCPC_TRANSMIT register fields [08/15] usb: typec: tcpm/tcpci_maxim: sort TCPC_ALERT_MASK values by bit [09/15] usb: typec: tcpm/tcpci_maxim: simplify clearing of TCPC_ALERT_RX_BUF_OVF [10/15] usb: typec: tcpm/tcpci_maxim: drop STATUS_CHECK() [11/15] usb: typec: tcpm/tcpci_maxim: use GENMASK() for TCPC_VENDOR_CC_CTRL2 register [12/15] usb: typec: tcpm/tcpci_maxim: use GENMASK() for TCPC_VENDOR_CC_CTRL3 register [13/15] usb: typec: tcpm/tcpci_maxim: use GENMASK() for TCPC_VENDOR_ADC_CTRL1 register [14/15] usb: typec: tcpm/tcpci_maxim: convert to dev_err_probe() [15/15] usb: typec: tcpm/tcpci_maxim: use device managed TCPCI port deregistration

Message ID

20240710-tcpc-cleanup-v1-10-0ec1f41f4263@linaro.org

State

New

Headers

From: =?utf-8?q?Andr=C3=A9_Draszik?= <andre.draszik@linaro.org>
Date: Wed, 10 Jul 2024 11:36:17 +0100
Subject: [PATCH 10/15] usb: typec: tcpm/tcpci_maxim: drop STATUS_CHECK()
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Message-Id: <20240710-tcpc-cleanup-v1-10-0ec1f41f4263@linaro.org>
References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org>
In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org>
To: Heikki Krogerus <heikki.krogerus@linux.intel.com>,
 Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Peter Griffin <peter.griffin@linaro.org>,
  Tudor Ambarus <tudor.ambarus@linaro.org>,
  Will McVicker <willmcvicker@google.com>,
  Badhri Jagan Sridharan <badhri@google.com>, kernel-team@android.com,
  linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr?=
	=?utf-8?q?=C3=A9_Draszik?= <andre.draszik@linaro.org>

Series

usb: typec: tcpci: few TCPCi & TCPCi-Maxim cleanups (mostly genmask()) | expand

Commit Message

André Draszik July 10, 2024, 10:36 a.m. UTC

Only one user of STATUS_CHECK() remains, and the code can actually be
made more legible by simply avoiding the use of that wrapper macro,
allowing to also drop the macro altogether.

Do so.

Signed-off-by: André Draszik <andre.draszik@linaro.org>
---
 drivers/usb/typec/tcpm/maxim_contaminant.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/usb/typec/tcpm/maxim_contaminant.c b/drivers/usb/typec/tcpm/maxim_contaminant.c
index e7687aeb69c0..8ac8eeade277 100644
--- a/drivers/usb/typec/tcpm/maxim_contaminant.c
+++ b/drivers/usb/typec/tcpm/maxim_contaminant.c
@@ -46,8 +46,6 @@  enum fladc_select {
 #define READ1_SLEEP_MS			10
 #define READ2_SLEEP_MS			5
 
-#define STATUS_CHECK(reg, mask, val)	(((reg) & (mask)) == (val))
-
 #define IS_CC_OPEN(cc_status) \
 	(FIELD_GET(TCPC_CC_STATUS_CC1, cc_status) == TCPC_CC_STATE_SRC_OPEN \
 	 && FIELD_GET(TCPC_CC_STATUS_CC2, cc_status) == TCPC_CC_STATE_SRC_OPEN)
@@ -368,7 +366,7 @@  bool max_contaminant_is_contaminant(struct max_tcpci_chip *chip, bool disconnect
 		}
 		return false;
 	} else if (chip->contaminant_state == DETECTED) {
-		if (STATUS_CHECK(cc_status, TCPC_CC_STATUS_TOGGLING, 0)) {
+		if (!(cc_status & TCPC_CC_STATUS_TOGGLING)) {
 			chip->contaminant_state = max_contaminant_detect_contaminant(chip);
 			if (chip->contaminant_state == DETECTED) {
 				max_contaminant_enable_dry_detection(chip);

[10/15] usb: typec: tcpm/tcpci_maxim: drop STATUS_CHECK()

Commit Message

Patch