platform/chrome: cros_ec_typec: Factor out PD identity parsing
Factor out the PD identity parsing code into a separate function. This way it can be re-used for Cable PD identity parsing in future patches. No functional changes are introduced by this patch. Signed-off-by: Prashant Malani <pmalani@chromium.org> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Benson Leung <bleung@chromium.org> Link: https://lore.kernel.org/r/20201116201150.2919178-6-pmalani@chromium.org
This commit is contained in:
parent
a906f45d14
commit
8fab275519
|
@ -655,6 +655,28 @@ err_cleanup:
|
|||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Parse the PD identity data from the EC PD discovery responses and copy that to the supplied
|
||||
* PD identity struct.
|
||||
*/
|
||||
static void cros_typec_parse_pd_identity(struct usb_pd_identity *id,
|
||||
struct ec_response_typec_discovery *disc)
|
||||
{
|
||||
int i;
|
||||
|
||||
/* First, update the PD identity VDOs for the partner. */
|
||||
if (disc->identity_count > 0)
|
||||
id->id_header = disc->discovery_vdo[0];
|
||||
if (disc->identity_count > 1)
|
||||
id->cert_stat = disc->discovery_vdo[1];
|
||||
if (disc->identity_count > 2)
|
||||
id->product = disc->discovery_vdo[2];
|
||||
|
||||
/* Copy the remaining identity VDOs till a maximum of 6. */
|
||||
for (i = 3; i < disc->identity_count && i < VDO_MAX_OBJECTS; i++)
|
||||
id->vdo[i - 3] = disc->discovery_vdo[i];
|
||||
}
|
||||
|
||||
static int cros_typec_handle_sop_disc(struct cros_typec_data *typec, int port_num)
|
||||
{
|
||||
struct cros_typec_port *port = typec->ports[port_num];
|
||||
|
@ -664,7 +686,6 @@ static int cros_typec_handle_sop_disc(struct cros_typec_data *typec, int port_nu
|
|||
.partner_type = TYPEC_PARTNER_SOP,
|
||||
};
|
||||
int ret = 0;
|
||||
int i;
|
||||
|
||||
if (!port->partner) {
|
||||
dev_err(typec->dev,
|
||||
|
@ -682,17 +703,7 @@ static int cros_typec_handle_sop_disc(struct cros_typec_data *typec, int port_nu
|
|||
goto disc_exit;
|
||||
}
|
||||
|
||||
/* First, update the PD identity VDOs for the partner. */
|
||||
if (sop_disc->identity_count > 0)
|
||||
port->p_identity.id_header = sop_disc->discovery_vdo[0];
|
||||
if (sop_disc->identity_count > 1)
|
||||
port->p_identity.cert_stat = sop_disc->discovery_vdo[1];
|
||||
if (sop_disc->identity_count > 2)
|
||||
port->p_identity.product = sop_disc->discovery_vdo[2];
|
||||
|
||||
/* Copy the remaining identity VDOs till a maximum of 6. */
|
||||
for (i = 3; i < sop_disc->identity_count && i < VDO_MAX_OBJECTS; i++)
|
||||
port->p_identity.vdo[i - 3] = sop_disc->discovery_vdo[i];
|
||||
cros_typec_parse_pd_identity(&port->p_identity, sop_disc);
|
||||
|
||||
ret = typec_partner_set_identity(port->partner);
|
||||
if (ret < 0) {
|
||||
|
|
Loading…
Reference in New Issue