Revert "clocksource/drivers/timer-probe: Avoid creating dead devices"

This reverts commit ce07828a4cdf64f904c6829d014367f6ed0ecea9.

The change breaks systems on which the DT node of a device is used by
multiple drivers. The proposed workaround to clear OF_POPULATED is just a
band aid and this needs to be cleaned up at the root of the problem.

Revert this for now.

Reported-by: Ionela Voinescu <ionela.voinescu@arm.com>
Reported-by: Jon Hunter <jonathanh@nvidia.com>
Requested-by: Rob Herring <robh+dt@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Saravana Kannan <saravanak@google.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200324175955.GA16972@arm.com

diff --git a/drivers/clocksource/timer-probe.c b/drivers/clocksource/timer-probe.c
index a10f28d750a97900f147eff4f58f93c279751e80..ee9574da53c059a86ed7942aaea24d96074e0faa 100644 (file)
--- a/drivers/clocksource/timer-probe.c
+++ b/drivers/clocksource/timer-probe.c
@@ -27,10 +27,8 @@ void __init timer_probe(void)
 
                init_func_ret = match->data;
 
-               of_node_set_flag(np, OF_POPULATED);
                ret = init_func_ret(np);
                if (ret) {
-                       of_node_clear_flag(np, OF_POPULATED);
                        if (ret != -EPROBE_DEFER)
                                pr_err("Failed to initialize '%pOF': %d\n", np,
                                       ret);