mirror of
https://github.com/torvalds/linux.git
synced 2024-10-24 22:20:55 +00:00
driver core: Move driver_sysfs_remove() after driver_sysfs_add()
The driver_sysfs_remove() should be called after driver_sysfs_add() in really_probe(). The out-of-order driver_sysfs_remove() tries to remove some nonexistent nodes under the device and driver sysfs nodes. This is allowed, hence this change doesn't fix any problem, just a cleanup. Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> Link: https://lore.kernel.org/r/20211231033901.2168664-2-baolu.lu@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
3407d826c1
commit
885e50253b
|
@ -577,14 +577,14 @@ re_probe:
|
||||||
if (dev->bus->dma_configure) {
|
if (dev->bus->dma_configure) {
|
||||||
ret = dev->bus->dma_configure(dev);
|
ret = dev->bus->dma_configure(dev);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto probe_failed;
|
goto sysfs_failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = driver_sysfs_add(dev);
|
ret = driver_sysfs_add(dev);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
pr_err("%s: driver_sysfs_add(%s) failed\n",
|
pr_err("%s: driver_sysfs_add(%s) failed\n",
|
||||||
__func__, dev_name(dev));
|
__func__, dev_name(dev));
|
||||||
goto probe_failed;
|
goto sysfs_failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dev->pm_domain && dev->pm_domain->activate) {
|
if (dev->pm_domain && dev->pm_domain->activate) {
|
||||||
|
@ -657,6 +657,8 @@ dev_groups_failed:
|
||||||
else if (drv->remove)
|
else if (drv->remove)
|
||||||
drv->remove(dev);
|
drv->remove(dev);
|
||||||
probe_failed:
|
probe_failed:
|
||||||
|
driver_sysfs_remove(dev);
|
||||||
|
sysfs_failed:
|
||||||
if (dev->bus)
|
if (dev->bus)
|
||||||
blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
|
blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
|
||||||
BUS_NOTIFY_DRIVER_NOT_BOUND, dev);
|
BUS_NOTIFY_DRIVER_NOT_BOUND, dev);
|
||||||
|
@ -666,7 +668,6 @@ pinctrl_bind_failed:
|
||||||
arch_teardown_dma_ops(dev);
|
arch_teardown_dma_ops(dev);
|
||||||
kfree(dev->dma_range_map);
|
kfree(dev->dma_range_map);
|
||||||
dev->dma_range_map = NULL;
|
dev->dma_range_map = NULL;
|
||||||
driver_sysfs_remove(dev);
|
|
||||||
dev->driver = NULL;
|
dev->driver = NULL;
|
||||||
dev_set_drvdata(dev, NULL);
|
dev_set_drvdata(dev, NULL);
|
||||||
if (dev->pm_domain && dev->pm_domain->dismiss)
|
if (dev->pm_domain && dev->pm_domain->dismiss)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user