usb: typec: class: Don't use port parent for getting mux handles
Subsystems (2)
Heikki Krogerus
maintainerPATCH 9/12 usb: typec: class: Don't use port parent for getting mux handles
It is not possible to use the parent of the port device when requesting mux handles as the parent may be a multiport USB Type-C or PD controller. The muxes must be assigned to the ports, not the controllers.
This will also move the requesting of the muxes after the port device is initialized.
Acked-by Hans de Goede <[email protected]>
Tested-by Hans de Goede <[email protected]>
Signed-off-by Heikki Krogerus <[email protected]>
--- drivers/usb/typec/class.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-)
drivers/usb/typec/class.c +15 -23
@@ -1501,7 +1501,7 @@ typec_port_register_altmode(struct typec_port *port,sprintf (id,"id%04xm%02x" , desc->svid, desc->mode); - mux =typec_mux_get (port->dev.parent, id); + mux =typec_mux_get (&port->dev, id);if (IS_ERR (mux))return ERR_CAST (mux);
@@ -1541,18 +1541,6 @@ struct typec_port *typec_register_port(struct device *parent,return ERR_PTR (id); } - port->sw =typec_switch_get (cap->fwnode ? &port->dev : parent); -if (IS_ERR (port->sw)) { - ret =PTR_ERR (port->sw); - goto err_switch; - } - - port->mux =typec_mux_get (parent,"typec-mux" ); -if (IS_ERR (port->mux)) { - ret =PTR_ERR (port->mux); - goto err_mux; - } -switch (cap->type) {case TYPEC_PORT_SRC : port->pwr_role =TYPEC_SOURCE ;
@@ -1593,13 +1581,26 @@ struct typec_port *typec_register_port(struct device *parent, port->port_type = cap->type; port->prefer_role = cap->prefer_role; +device_initialize (&port->dev); port->dev.class = typec_class; port->dev.parent = parent; port->dev.fwnode = cap->fwnode; port->dev.type = &typec_port_dev_type;dev_set_name (&port->dev,"port%d" , id); - ret =device_register (&port->dev); + port->sw =typec_switch_get (&port->dev); +if (IS_ERR (port->sw)) { +put_device (&port->dev); +return ERR_CAST (port->sw); + } + + port->mux =typec_mux_get (&port->dev,"typec-mux" ); +if (IS_ERR (port->mux)) { +put_device (&port->dev); +return ERR_CAST (port->mux); + } + + ret =device_add (&port->dev);if (ret) {dev_err (parent,"failed to register port (%d)\n" , ret);put_device (&port->dev);
@@ -1607,15 +1608,6 @@ struct typec_port *typec_register_port(struct device *parent, }return port; - -err_mux: -typec_switch_put (port->sw); - -err_switch: -ida_simple_remove (&typec_index_ida, port->id); -kfree (port); - -return ERR_PTR (ret); }EXPORT_SYMBOL_GPL (typec_register_port);