Skip to content

Commit 4479730

Browse files
committed
Revert "clocksource/drivers/timer-probe: Avoid creating dead devices"
This reverts commit 4f41fe3. 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
1 parent ca214e2 commit 4479730

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

drivers/clocksource/timer-probe.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ void __init timer_probe(void)
2727

2828
init_func_ret = match->data;
2929

30-
of_node_set_flag(np, OF_POPULATED);
3130
ret = init_func_ret(np);
3231
if (ret) {
33-
of_node_clear_flag(np, OF_POPULATED);
3432
if (ret != -EPROBE_DEFER)
3533
pr_err("Failed to initialize '%pOF': %d\n", np,
3634
ret);

0 commit comments

Comments
 (0)