diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-30 13:26:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-30 13:26:39 +0200 |
| commit | f87da58b797aa591f2e288c7012faf3ab1e54c55 (patch) | |
| tree | c1c991fe1350515a7b5ca01818f66f677cc0e14e /drivers/usb/roles/class.c | |
| parent | fb583c8eeeb1fd57e24ef41ed94c9112067aeac9 (diff) | |
| parent | 36f3313d6bff91ab2a9e47698c27d15363640a4e (diff) | |
Merge branch 'generic_lookup_helpers' into driver-core-next
This was on a separate branch so that others can pull it in.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/roles/class.c')
| -rw-r--r-- | drivers/usb/roles/class.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c index 86defca6623e..0526efbc4922 100644 --- a/drivers/usb/roles/class.c +++ b/drivers/usb/roles/class.c @@ -85,16 +85,6 @@ enum usb_role usb_role_switch_get_role(struct usb_role_switch *sw) } EXPORT_SYMBOL_GPL(usb_role_switch_get_role); -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)); -} - static void *usb_role_switch_match(struct device_connection *con, int ep, void *data) { @@ -104,11 +94,9 @@ static void *usb_role_switch_match(struct device_connection *con, int ep, if (con->id && !fwnode_property_present(con->fwnode, con->id)) return NULL; - dev = class_find_device(role_class, NULL, con->fwnode, - switch_fwnode_match); + dev = class_find_device_by_fwnode(role_class, con->fwnode); } else { - dev = class_find_device(role_class, NULL, con->endpoint[ep], - switch_name_match); + dev = class_find_device_by_name(role_class, con->endpoint[ep]); } return dev ? to_role_switch(dev) : ERR_PTR(-EPROBE_DEFER); |