aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base/core.c')
-rw-r--r--drivers/base/core.c24
1 files changed, 2 insertions, 22 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index de775c7a4d7c..605905de0cca 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -440,19 +440,6 @@ static void device_link_wait_for_supplier(struct device *consumer)
}
/**
- * device_link_remove_from_wfs - Unmark device as waiting for supplier
- * @consumer: Consumer device
- *
- * Unmark the consumer device as waiting for suppliers to become available.
- */
-void device_link_remove_from_wfs(struct device *consumer)
-{
- mutex_lock(&wfs_lock);
- list_del_init(&consumer->links.needs_suppliers);
- mutex_unlock(&wfs_lock);
-}
-
-/**
* device_link_check_waiting_consumers - Try to unmark waiting consumers
*
* Loops through all consumers waiting on suppliers and tries to add all their
@@ -469,19 +456,12 @@ void device_link_remove_from_wfs(struct device *consumer)
static void device_link_check_waiting_consumers(void)
{
struct device *dev, *tmp;
- int ret;
mutex_lock(&wfs_lock);
list_for_each_entry_safe(dev, tmp, &wait_for_suppliers,
- links.needs_suppliers) {
- ret = 0;
- if (dev->has_edit_links)
- ret = driver_edit_links(dev);
- else if (dev->bus->add_links)
- ret = dev->bus->add_links(dev);
- if (!ret)
+ links.needs_suppliers)
+ if (!dev->bus->add_links(dev))
list_del_init(&dev->links.needs_suppliers);
- }
mutex_unlock(&wfs_lock);
}