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/base/devcon.c | |
| parent | fb583c8eeeb1fd57e24ef41ed94c9112067aeac9 (diff) | |
| parent | 36f3313d6bff91ab2a9e47698c27d15363640a4e (diff) | |
| download | linux-f87da58b797aa591f2e288c7012faf3ab1e54c55.tar.gz linux-f87da58b797aa591f2e288c7012faf3ab1e54c55.tar.bz2 linux-f87da58b797aa591f2e288c7012faf3ab1e54c55.zip | |
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/base/devcon.c')
| -rw-r--r-- | drivers/base/devcon.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/base/devcon.c b/drivers/base/devcon.c index 09f28479b243..1d488dc5dd0c 100644 --- a/drivers/base/devcon.c +++ b/drivers/base/devcon.c @@ -133,19 +133,13 @@ static struct bus_type *generic_match_buses[] = { NULL, }; -static int device_fwnode_match(struct device *dev, const void *fwnode) -{ - return dev_fwnode(dev) == fwnode; -} - static void *device_connection_fwnode_match(struct device_connection *con) { struct bus_type *bus; struct device *dev; for (bus = generic_match_buses[0]; bus; bus++) { - dev = bus_find_device(bus, NULL, (void *)con->fwnode, - device_fwnode_match); + dev = bus_find_device_by_fwnode(bus, con->fwnode); if (dev && !strncmp(dev_name(dev), con->id, strlen(con->id))) return dev; |