| Message ID | 20181024150525.11552-4-heikki.krogerus@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Adding graph handling to device connection API | expand |
Hi Heikki, Heikki Krogerus <heikki.krogerus@linux.intel.com> 于2018年10月24日周三 下午11:06写道： > > When the connections are defined in firmware, struct > device_connection will have the fwnode member pointing to > the device node (struct fwnode_handle) of the requested > device, and the endpoint will not be used at all in that > case. > > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/usb/common/roles.c | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/drivers/usb/common/roles.c b/drivers/usb/common/roles.c > index 99116af07f1d..bb52e006d203 100644 > --- a/drivers/usb/common/roles.c > +++ b/drivers/usb/common/roles.c > @@ -8,6 +8,7 @@ > */ > > #include <linux/usb/role.h> > +#include <linux/property.h> > #include <linux/device.h> > #include <linux/module.h> > #include <linux/mutex.h> > @@ -84,7 +85,12 @@ enum usb_role usb_role_switch_get_role(struct usb_role_switch *sw) > } > EXPORT_SYMBOL_GPL(usb_role_switch_get_role); > > -static int __switch_match(struct device *dev, const void *name) > +static int switch_fwnode_match(struct device *dev, const void *fwnode) > +{ > + return dev_fwnode(dev) == fwnode; Seems this should be dev_fwnode(dev->parent) == fwnode; The role switch is the child dev of the caller of usb_role_switch_register(). Li Jun > +} > + > +static int switch_name_match(struct device *dev, const void *name) > { > return !strcmp((const char *)name, dev_name(dev)); > } > @@ -94,8 +100,12 @@ static void *usb_role_switch_match(struct device_connection *con, int ep, > { > struct device *dev; > > - dev = class_find_device(role_class, NULL, con->endpoint[ep], > - __switch_match); > + if (con->fwnode) > + dev = class_find_device(role_class, NULL, con->fwnode, > + switch_fwnode_match); > + else > + dev = class_find_device(role_class, NULL, con->endpoint[ep], > + switch_name_match); > > return dev ? to_role_switch(dev) : ERR_PTR(-EPROBE_DEFER); > } > -- > 2.19.1 >
On Tue, Jan 22, 2019 at 01:40:02PM +0800, Jun Li wrote: > Hi Heikki, > Heikki Krogerus <heikki.krogerus@linux.intel.com> 于2018年10月24日周三 下午11:06写道： > > > > When the connections are defined in firmware, struct > > device_connection will have the fwnode member pointing to > > the device node (struct fwnode_handle) of the requested > > device, and the endpoint will not be used at all in that > > case. > > > > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > > --- > > drivers/usb/common/roles.c | 16 +++++++++++++--- > > 1 file changed, 13 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/usb/common/roles.c b/drivers/usb/common/roles.c > > index 99116af07f1d..bb52e006d203 100644 > > --- a/drivers/usb/common/roles.c > > +++ b/drivers/usb/common/roles.c > > @@ -8,6 +8,7 @@ > > */ > > > > #include <linux/usb/role.h> > > +#include <linux/property.h> > > #include <linux/device.h> > > #include <linux/module.h> > > #include <linux/mutex.h> > > @@ -84,7 +85,12 @@ enum usb_role usb_role_switch_get_role(struct usb_role_switch *sw) > > } > > EXPORT_SYMBOL_GPL(usb_role_switch_get_role); > > > > -static int __switch_match(struct device *dev, const void *name) > > +static int switch_fwnode_match(struct device *dev, const void *fwnode) > > +{ > > + return dev_fwnode(dev) == fwnode; > > Seems this should be dev_fwnode(dev->parent) == fwnode; > The role switch is the child dev of the caller of usb_role_switch_register(). Indeed. thanks,
diff --git a/drivers/usb/common/roles.c b/drivers/usb/common/roles.c index 99116af07f1d..bb52e006d203 100644 --- a/drivers/usb/common/roles.c +++ b/drivers/usb/common/roles.c @@ -8,6 +8,7 @@ */ #include <linux/usb/role.h> +#include <linux/property.h> #include <linux/device.h> #include <linux/module.h> #include <linux/mutex.h> @@ -84,7 +85,12 @@ enum usb_role usb_role_switch_get_role(struct usb_role_switch *sw) } EXPORT_SYMBOL_GPL(usb_role_switch_get_role); -static int __switch_match(struct device *dev, const void *name) +static int switch_fwnode_match(struct device *dev, const void *fwnode) +{ + return dev_fwnode(dev) == fwnode; +} + +static int switch_name_match(struct device *dev, const void *name) { return !strcmp((const char *)name, dev_name(dev)); } @@ -94,8 +100,12 @@ static void *usb_role_switch_match(struct device_connection *con, int ep, { struct device *dev; - dev = class_find_device(role_class, NULL, con->endpoint[ep], - __switch_match); + if (con->fwnode) + dev = class_find_device(role_class, NULL, con->fwnode, + switch_fwnode_match); + else + dev = class_find_device(role_class, NULL, con->endpoint[ep], + switch_name_match); return dev ? to_role_switch(dev) : ERR_PTR(-EPROBE_DEFER); }
When the connections are defined in firmware, struct device_connection will have the fwnode member pointing to the device node (struct fwnode_handle) of the requested device, and the endpoint will not be used at all in that case. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> --- drivers/usb/common/roles.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)