Commit a47bc5a0 authored by Prashant Malani's avatar Prashant Malani

platform/chrome: cros_ec_typec: Rename port altmode array

Rename "p_altmode" to "port_altmode" which is a less ambiguous name for
the port_altmode struct array.
Signed-off-by: default avatarPrashant Malani <pmalani@chromium.org>
Acked-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20220712210318.2671292-1-pmalani@chromium.org
parent ce838f7d
...@@ -60,8 +60,7 @@ struct cros_typec_port { ...@@ -60,8 +60,7 @@ struct cros_typec_port {
uint8_t mux_flags; uint8_t mux_flags;
uint8_t role; uint8_t role;
/* Port alt modes. */ struct typec_altmode port_altmode[CROS_EC_ALTMODE_MAX];
struct typec_altmode p_altmode[CROS_EC_ALTMODE_MAX];
/* Flag indicating that PD partner discovery data parsing is completed. */ /* Flag indicating that PD partner discovery data parsing is completed. */
bool sop_disc_done; bool sop_disc_done;
...@@ -282,16 +281,16 @@ static void cros_typec_register_port_altmodes(struct cros_typec_data *typec, ...@@ -282,16 +281,16 @@ static void cros_typec_register_port_altmodes(struct cros_typec_data *typec,
struct cros_typec_port *port = typec->ports[port_num]; struct cros_typec_port *port = typec->ports[port_num];
/* All PD capable CrOS devices are assumed to support DP altmode. */ /* All PD capable CrOS devices are assumed to support DP altmode. */
port->p_altmode[CROS_EC_ALTMODE_DP].svid = USB_TYPEC_DP_SID; port->port_altmode[CROS_EC_ALTMODE_DP].svid = USB_TYPEC_DP_SID;
port->p_altmode[CROS_EC_ALTMODE_DP].mode = USB_TYPEC_DP_MODE; port->port_altmode[CROS_EC_ALTMODE_DP].mode = USB_TYPEC_DP_MODE;
/* /*
* Register TBT compatibility alt mode. The EC will not enter the mode * Register TBT compatibility alt mode. The EC will not enter the mode
* if it doesn't support it, so it's safe to register it unconditionally * if it doesn't support it, so it's safe to register it unconditionally
* here for now. * here for now.
*/ */
port->p_altmode[CROS_EC_ALTMODE_TBT].svid = USB_TYPEC_TBT_SID; port->port_altmode[CROS_EC_ALTMODE_TBT].svid = USB_TYPEC_TBT_SID;
port->p_altmode[CROS_EC_ALTMODE_TBT].mode = TYPEC_ANY_MODE; port->port_altmode[CROS_EC_ALTMODE_TBT].mode = TYPEC_ANY_MODE;
port->state.alt = NULL; port->state.alt = NULL;
port->state.mode = TYPEC_STATE_USB; port->state.mode = TYPEC_STATE_USB;
...@@ -431,7 +430,7 @@ static int cros_typec_enable_tbt(struct cros_typec_data *typec, ...@@ -431,7 +430,7 @@ static int cros_typec_enable_tbt(struct cros_typec_data *typec,
data.enter_vdo |= TBT_ENTER_MODE_ACTIVE_CABLE; data.enter_vdo |= TBT_ENTER_MODE_ACTIVE_CABLE;
if (!port->state.alt) { if (!port->state.alt) {
port->state.alt = &port->p_altmode[CROS_EC_ALTMODE_TBT]; port->state.alt = &port->port_altmode[CROS_EC_ALTMODE_TBT];
ret = cros_typec_usb_safe_state(port); ret = cros_typec_usb_safe_state(port);
if (ret) if (ret)
return ret; return ret;
...@@ -473,7 +472,7 @@ static int cros_typec_enable_dp(struct cros_typec_data *typec, ...@@ -473,7 +472,7 @@ static int cros_typec_enable_dp(struct cros_typec_data *typec,
/* Configuration VDO. */ /* Configuration VDO. */
dp_data.conf = DP_CONF_SET_PIN_ASSIGN(pd_ctrl->dp_mode); dp_data.conf = DP_CONF_SET_PIN_ASSIGN(pd_ctrl->dp_mode);
if (!port->state.alt) { if (!port->state.alt) {
port->state.alt = &port->p_altmode[CROS_EC_ALTMODE_DP]; port->state.alt = &port->port_altmode[CROS_EC_ALTMODE_DP];
ret = cros_typec_usb_safe_state(port); ret = cros_typec_usb_safe_state(port);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment