On Fri, Nov 06, 2020 at 10:41:04AM -0800, Prashant Malani wrote:
> Rename the sop_disc data struct which is used to store PD discovery data
> to the more generic name of disc_data. It can then be re-used to store
> and process cable discovery data.
>
> Signed-off-by: Prashant Malani <pmal...@chromium.org>
Reviewed-by: Heikki Krogerus <heikki.kroge...@linux.intel.com>
> ---
>
> Changes in v2:
> - No changes.
>
> drivers/platform/chrome/cros_ec_typec.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/platform/chrome/cros_ec_typec.c
> b/drivers/platform/chrome/cros_ec_typec.c
> index f6d3c37c2c27..3c8ff07c8803 100644
> --- a/drivers/platform/chrome/cros_ec_typec.c
> +++ b/drivers/platform/chrome/cros_ec_typec.c
> @@ -59,7 +59,7 @@ struct cros_typec_port {
>
> /* Flag indicating that PD partner discovery data parsing is completed.
> */
> bool sop_disc_done;
> - struct ec_response_typec_discovery *sop_disc;
> + struct ec_response_typec_discovery *disc_data;
> struct list_head partner_mode_list;
> };
>
> @@ -323,8 +323,8 @@ static int cros_typec_init_ports(struct cros_typec_data
> *typec)
>
> cros_typec_register_port_altmodes(typec, port_num);
>
> - cros_port->sop_disc = devm_kzalloc(dev,
> EC_PROTO2_MAX_RESPONSE_SIZE, GFP_KERNEL);
> - if (!cros_port->sop_disc) {
> + cros_port->disc_data = devm_kzalloc(dev,
> EC_PROTO2_MAX_RESPONSE_SIZE, GFP_KERNEL);
> + if (!cros_port->disc_data) {
> ret = -ENOMEM;
> goto unregister_ports;
> }
> @@ -617,7 +617,7 @@ static int cros_typec_get_mux_info(struct cros_typec_data
> *typec, int port_num,
> static int cros_typec_register_altmodes(struct cros_typec_data *typec, int
> port_num)
> {
> struct cros_typec_port *port = typec->ports[port_num];
> - struct ec_response_typec_discovery *sop_disc = port->sop_disc;
> + struct ec_response_typec_discovery *sop_disc = port->disc_data;
> struct cros_typec_altmode_node *node;
> struct typec_altmode_desc desc;
> struct typec_altmode *amode;
> @@ -682,7 +682,7 @@ static void cros_typec_parse_pd_identity(struct
> usb_pd_identity *id,
> static int cros_typec_handle_sop_disc(struct cros_typec_data *typec, int
> port_num)
> {
> struct cros_typec_port *port = typec->ports[port_num];
> - struct ec_response_typec_discovery *sop_disc = port->sop_disc;
> + struct ec_response_typec_discovery *sop_disc = port->disc_data;
> struct ec_params_typec_discovery req = {
> .port = port_num,
> .partner_type = TYPEC_PARTNER_SOP,
> --
> 2.29.1.341.ge80a0c044ae-goog
thanks,
--
heikki
