From: Prashant Malani <pmalani@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Prashant Malani <pmalani@chromium.org>,
Benson Leung <bleung@chromium.org>,
chrome-platform@lists.linux.dev (open list:CHROMEOS EC USB
TYPE-C DRIVER), Guenter Roeck <groeck@chromium.org>
Subject: [PATCH 1/4] platform/chrome: cros_ec_typec: Move mux flag checks
Date: Mon, 7 Feb 2022 21:40:24 +0000 [thread overview]
Message-ID: <20220207214026.1526151-2-pmalani@chromium.org> (raw)
In-Reply-To: <20220207214026.1526151-1-pmalani@chromium.org>
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@chromium.org>
---
drivers/platform/chrome/cros_ec_typec.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index c6f17e3ef72d..445da4f122e7 100644
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -519,7 +519,14 @@ static int cros_typec_configure_mux(struct cros_typec_data *typec, int port_num,
struct cros_typec_port *port = typec->ports[port_num];
struct ec_params_usb_pd_mux_ack mux_ack;
enum typec_orientation orientation;
- int ret;
+ int ret = 0;
+
+ /* 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);
@@ -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
next prev parent reply other threads:[~2022-02-07 21:40 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-07 21:40 [PATCH 0/4] platform/chrome: cros_ec_typec: Reorganize mux configuration Prashant Malani
2022-02-07 21:40 ` Prashant Malani [this message]
2022-02-08 5:33 ` [PATCH 1/4] platform/chrome: cros_ec_typec: Move mux flag checks Tzung-Bi Shih
2022-02-08 6:03 ` Prashant Malani
2022-02-07 21:40 ` [PATCH 2/4] platform/chrome: cros_ec_typec: Get mux state inside configure_mux Prashant Malani
2022-02-08 5:35 ` Tzung-Bi Shih
2022-02-08 6:04 ` Prashant Malani
2022-02-07 21:40 ` [PATCH 3/4] platform/chrome: cros_ec_typec: Configure muxes at start of port update Prashant Malani
2022-02-08 5:38 ` Tzung-Bi Shih
2022-02-08 6:12 ` Prashant Malani
2022-02-08 11:15 ` Tzung-Bi Shih
2022-02-08 18:35 ` Prashant Malani
2022-02-08 22:58 ` Prashant Malani
2022-02-09 3:31 ` Tzung-Bi Shih
2022-02-09 3:41 ` Prashant Malani
2022-02-07 21:40 ` [PATCH 4/4] platform/chrome: cros_ec_typec: Update mux flags during partner removal Prashant Malani
2022-02-08 5:38 ` Tzung-Bi Shih
2022-02-08 6:15 ` Prashant Malani
2022-02-08 11:15 ` Tzung-Bi Shih
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220207214026.1526151-2-pmalani@chromium.org \
--to=pmalani@chromium.org \
--cc=bleung@chromium.org \
--cc=chrome-platform@lists.linux.dev \
--cc=groeck@chromium.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).