[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220208184721.1697194-2-pmalani@chromium.org>
Date: Tue, 8 Feb 2022 18:47:18 +0000
From: Prashant Malani <pmalani@...omium.org>
To: linux-kernel@...r.kernel.org
Cc: Prashant Malani <pmalani@...omium.org>,
Benson Leung <bleung@...omium.org>,
chrome-platform@...ts.linux.dev (open list:CHROMEOS EC USB TYPE-C
DRIVER), Guenter Roeck <groeck@...omium.org>
Subject: [PATCH v2 1/4] platform/chrome: cros_ec_typec: Move mux flag checks
Move mux and role flag checks inside of cros_typec_configure_mux(),
which is a more logical location for them.
Signed-off-by: Prashant Malani <pmalani@...omium.org>
---
Changes in v2:
- Removed unrelated "ret" variable initialization.
drivers/platform/chrome/cros_ec_typec.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index c6f17e3ef72d..58d08dd02f65 100644
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -521,6 +521,13 @@ static int cros_typec_configure_mux(struct cros_typec_data *typec, int port_num,
enum typec_orientation orientation;
int ret;
+ /* No change needs to be made, let's exit early. */
+ if (port->mux_flags == mux_flags && port->role == pd_ctrl->role)
+ return 0;
+
+ port->mux_flags = mux_flags;
+ port->role = pd_ctrl->role;
+
if (mux_flags == USB_PD_MUX_NONE) {
ret = cros_typec_usb_disconnect_state(port);
goto mux_ack;
@@ -983,13 +990,6 @@ static int cros_typec_port_update(struct cros_typec_data *typec, int port_num)
return 0;
}
- /* No change needs to be made, let's exit early. */
- if (typec->ports[port_num]->mux_flags == mux_resp.flags &&
- typec->ports[port_num]->role == resp.role)
- return 0;
-
- typec->ports[port_num]->mux_flags = mux_resp.flags;
- typec->ports[port_num]->role = resp.role;
ret = cros_typec_configure_mux(typec, port_num, mux_resp.flags, &resp);
if (ret)
dev_warn(typec->dev, "Configure muxes failed, err = %d\n", ret);
--
2.35.0.263.gb82422642f-goog
Powered by blists - more mailing lists