The following commit has been merged into the timers/core branch of tip: Commit-ID: 763719771e84b8c8c2f53af668cdc905faa608de Gitweb: https://git.kernel.org/tip/763719771e84b8c8c2f53af668cdc905faa608de Author: Jon Hunter <[email protected]> AuthorDate: Wed, 21 Aug 2019 16:02:40 +01:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Tue, 27 Aug 2019 00:31:39 +02:00
clocksource/drivers/timer-of: Do not warn on deferred probe Deferred probe is an expected return value for clk_get() on many platforms. The driver deals with it properly, so there's no need to output a warning that may potentially confuse users. Signed-off-by: Jon Hunter <[email protected]> Signed-off-by: Daniel Lezcano <[email protected]> --- drivers/clocksource/timer-of.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c index 8054228..d8c2bd4 100644 --- a/drivers/clocksource/timer-of.c +++ b/drivers/clocksource/timer-of.c @@ -113,8 +113,10 @@ static __init int timer_of_clk_init(struct device_node *np, of_clk->clk = of_clk->name ? of_clk_get_by_name(np, of_clk->name) : of_clk_get(np, of_clk->index); if (IS_ERR(of_clk->clk)) { - pr_err("Failed to get clock for %pOF\n", np); - return PTR_ERR(of_clk->clk); + ret = PTR_ERR(of_clk->clk); + if (ret != -EPROBE_DEFER) + pr_err("Failed to get clock for %pOF\n", np); + goto out; } ret = clk_prepare_enable(of_clk->clk);
