|
@@ -329,6 +329,7 @@ static int really_probe(struct device *dev, struct device_driver *drv)
|
|
{
|
|
{
|
|
int ret = -EPROBE_DEFER;
|
|
int ret = -EPROBE_DEFER;
|
|
int local_trigger_count = atomic_read(&deferred_trigger_count);
|
|
int local_trigger_count = atomic_read(&deferred_trigger_count);
|
|
|
|
+ bool test_remove = IS_ENABLED(CONFIG_DEBUG_TEST_DRIVER_REMOVE);
|
|
|
|
|
|
if (defer_all_probes) {
|
|
if (defer_all_probes) {
|
|
/*
|
|
/*
|
|
@@ -346,6 +347,7 @@ static int really_probe(struct device *dev, struct device_driver *drv)
|
|
drv->bus->name, __func__, drv->name, dev_name(dev));
|
|
drv->bus->name, __func__, drv->name, dev_name(dev));
|
|
WARN_ON(!list_empty(&dev->devres_head));
|
|
WARN_ON(!list_empty(&dev->devres_head));
|
|
|
|
|
|
|
|
+re_probe:
|
|
dev->driver = drv;
|
|
dev->driver = drv;
|
|
|
|
|
|
/* If using pinctrl, bind pins now before probing */
|
|
/* If using pinctrl, bind pins now before probing */
|
|
@@ -383,6 +385,25 @@ static int really_probe(struct device *dev, struct device_driver *drv)
|
|
goto probe_failed;
|
|
goto probe_failed;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (test_remove) {
|
|
|
|
+ test_remove = false;
|
|
|
|
+
|
|
|
|
+ if (dev->bus && dev->bus->remove)
|
|
|
|
+ dev->bus->remove(dev);
|
|
|
|
+ else if (drv->remove)
|
|
|
|
+ drv->remove(dev);
|
|
|
|
+
|
|
|
|
+ devres_release_all(dev);
|
|
|
|
+ driver_sysfs_remove(dev);
|
|
|
|
+ dev->driver = NULL;
|
|
|
|
+ dev_set_drvdata(dev, NULL);
|
|
|
|
+ if (dev->pm_domain && dev->pm_domain->dismiss)
|
|
|
|
+ dev->pm_domain->dismiss(dev);
|
|
|
|
+ pm_runtime_reinit(dev);
|
|
|
|
+
|
|
|
|
+ goto re_probe;
|
|
|
|
+ }
|
|
|
|
+
|
|
pinctrl_init_done(dev);
|
|
pinctrl_init_done(dev);
|
|
|
|
|
|
if (dev->pm_domain && dev->pm_domain->sync)
|
|
if (dev->pm_domain && dev->pm_domain->sync)
|