On Wed, Feb 02, 2022 at 04:19:46PM -0600, Samuel Holland wrote: > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index 5fce795b69c7..8b58aa6e3509 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -5935,32 +5935,10 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, > if (!fwnode) > return -EINVAL; > > - /* > - * This fwnode has a "compatible" property, but is never populated as a > - * struct device. Instead we simply parse it to read the properties. > - * This it breaks fw_devlink=on. To maintain backward compatibility > - * with existing DT files, we work around this by deleting any > - * fwnode_links to/from this fwnode. > - */ > - fw_devlink_purge_absent_suppliers(fwnode); > - > - /* USB data support is optional */ > - ret = fwnode_property_read_string(fwnode, "data-role", &cap_str); > - if (ret == 0) { > - ret = typec_find_port_data_role(cap_str); > - if (ret < 0) > - return ret; > - port->typec_caps.data = ret; > - } > - > - ret = fwnode_property_read_string(fwnode, "power-role", &cap_str); > + ret = typec_get_fw_cap(&port->typec_caps, fwnode); > if (ret < 0) > return ret; > > - ret = typec_find_port_power_role(cap_str); > - if (ret < 0) > - return ret; > - port->typec_caps.type = ret; > port->port_type = port->typec_caps.type; > port->pd_supported = !fwnode_property_read_bool(fwnode, "pd-disable"); > > @@ -5997,14 +5975,6 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, > if (port->port_type == TYPEC_PORT_SRC) > return 0; > > - /* Get the preferred power role for DRP */ > - ret = fwnode_property_read_string(fwnode, "try-power-role", &cap_str); > - if (ret < 0) > - return ret; > - > - port->typec_caps.prefer_role = typec_find_power_role(cap_str); > - if (port->typec_caps.prefer_role < 0) > - return -EINVAL; > sink: > port->self_powered = fwnode_property_read_bool(fwnode, "self-powered"); It looks like after this there are no more users for that cap_str variable. You need to remove that too. thanks, -- heikki