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

usb: typec: tcpm/tcpci_maxim: simplify clearing of TCPC_ALERT_RX_BUF_OVF 



There is no need for using the ternary if/else here, simply mask
TCPC_ALERT_RX_BUF_OVF as necessary, which arguably makes the code
easier to read.

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-9-0ec1f41f4263@linaro.org


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

drivers/usb/typec/tcpm/tcpci_maxim_core.c

+4 −6
Original line number Diff line number Diff line
@@ -193,9 +193,8 @@ static void process_rx(struct max_tcpci_chip *chip, u16 status) 
	 * Read complete, clear RX status alert bit.

	 * Clear overflow as well if set.

	 */

	ret = max_tcpci_write16(chip, TCPC_ALERT, status & TCPC_ALERT_RX_BUF_OVF ?

				TCPC_ALERT_RX_STATUS | TCPC_ALERT_RX_BUF_OVF :

				TCPC_ALERT_RX_STATUS);

	ret = max_tcpci_write16(chip, TCPC_ALERT,

				TCPC_ALERT_RX_STATUS | (status & TCPC_ALERT_RX_BUF_OVF));

	if (ret < 0)

		return;
@@ -297,9 +296,8 @@ static irqreturn_t _max_tcpci_irq(struct max_tcpci_chip *chip, u16 status) 
	 * be cleared until we have successfully retrieved message.

	 */

	if (status & ~TCPC_ALERT_RX_STATUS) {

		mask = status & TCPC_ALERT_RX_BUF_OVF ?

			status & ~(TCPC_ALERT_RX_STATUS | TCPC_ALERT_RX_BUF_OVF) :

			status & ~TCPC_ALERT_RX_STATUS;

		mask = status & ~(TCPC_ALERT_RX_STATUS

				  | (status & TCPC_ALERT_RX_BUF_OVF));

		ret = max_tcpci_write16(chip, TCPC_ALERT, mask);

		if (ret < 0) {

			dev_err(chip->dev, "ALERT clear failed\n");