From 4479730e9263befbb9ce9563a09563db2acb8f7c Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 28 Mar 2020 11:20:36 +0100 Subject: Revert "clocksource/drivers/timer-probe: Avoid creating dead devices" This reverts commit 4f41fe386a94639cd9a1831298d4f85db5662f1e. 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 Reported-by: Jon Hunter Requested-by: Rob Herring Signed-off-by: Thomas Gleixner Cc: Saravana Kannan Cc: Daniel Lezcano Link: https://lore.kernel.org/r/20200324175955.GA16972@arm.com --- drivers/clocksource/timer-probe.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/clocksource') diff --git a/drivers/clocksource/timer-probe.c b/drivers/clocksource/timer-probe.c index a10f28d750a9..ee9574da53c0 100644 --- 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); -- cgit v1.2.3-59-g8ed1b