Revert "driver core: Add edit_links() callback for drivers"
This reverts commit 134b23eec9
.
Based on a lot of email and in-person discussions, this patch series is
being reworked to address a number of issues that were pointed out that
needed to be taken care of before it should be merged. It will be
resubmitted with those changes hopefully soon.
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Saravana Kannan <saravanak@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -710,12 +710,6 @@ int driver_probe_device(struct device_driver *drv, struct device *dev)
|
||||
pr_debug("bus: '%s': %s: matched device %s with driver %s\n",
|
||||
drv->bus->name, __func__, dev_name(dev), drv->name);
|
||||
|
||||
if (drv->edit_links) {
|
||||
if (drv->edit_links(dev))
|
||||
dev->has_edit_links = true;
|
||||
else
|
||||
device_link_remove_from_wfs(dev);
|
||||
}
|
||||
pm_runtime_get_suppliers(dev);
|
||||
if (dev->parent)
|
||||
pm_runtime_get_sync(dev->parent);
|
||||
@@ -804,29 +798,6 @@ struct device_attach_data {
|
||||
bool have_async;
|
||||
};
|
||||
|
||||
static int __driver_edit_links(struct device_driver *drv, void *data)
|
||||
{
|
||||
struct device *dev = data;
|
||||
|
||||
if (!drv->edit_links)
|
||||
return 0;
|
||||
|
||||
if (driver_match_device(drv, dev) <= 0)
|
||||
return 0;
|
||||
|
||||
return drv->edit_links(dev);
|
||||
}
|
||||
|
||||
int driver_edit_links(struct device *dev)
|
||||
{
|
||||
int ret;
|
||||
|
||||
device_lock(dev);
|
||||
ret = bus_for_each_drv(dev->bus, NULL, dev, __driver_edit_links);
|
||||
device_unlock(dev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __device_attach_driver(struct device_driver *drv, void *_data)
|
||||
{
|
||||
struct device_attach_data *data = _data;
|
||||
|
Reference in New Issue
Block a user