Skip to content

Commit

Permalink
Revert "clocksource/drivers/timer-probe: Avoid creating dead devices"
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Thomas Gleixner committed Mar 28, 2020
1 parent ca214e2 commit 4479730
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions drivers/clocksource/timer-probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 4479730

Please sign in to comment.