platform/chrome: cros_ec_typec: Rename discovery struct

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 <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-7-pmalani@chromium.org

diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index 7a70138..bf98e2e 100644 (file)
--- 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;
                }
@@ -615,7 +615,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;
@@ -680,7 +680,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,