Commit 4d39e004 authored by André Draszik's avatar André Draszik Committed by Greg Kroah-Hartman
Browse files

usb: typec: tcpm/tcpci_maxim: drop STATUS_CHECK() 



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: default avatarAndré Draszik <andre.draszik@linaro.org>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240710-tcpc-cleanup-v1-10-0ec1f41f4263@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 064e7e5a

drivers/usb/typec/tcpm/maxim_contaminant.c

+1 −3
Original line number Diff line number Diff line
@@ -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);