Skip to contentSkip to conversation

clocksource/drivers/timer-of: Do not warn on deferred probe

PATCH Applied Jon Hunter 2 participants 3 messages Aug 21, 2019 – Aug 22, 2019

Subsystems (2)
Tegra architecture support Clocksource, clockevent drivers
lore
Share & tools
lore

Jon Hunter

author maintainer
#0 lore raw

PATCH 1/2 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]>
---
 drivers/clocksource/timer-of.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/clocksource/timer-of.c +4 -2
index 80542289fae7..d8c2bd4391d0 100644
@@ -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);
Signature · 1 line
2.17.1
author maintainer
#1 lore raw

PATCH 2/2 clocksource/drivers: Do not warn on probe defer

Deferred probe is an expected return value on many platforms and so there's no need to output a warning that may potentially confuse users.

Signed-off-by Jon Hunter <[email protected]>
---
 drivers/clocksource/timer-probe.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/clocksource/timer-probe.c +3 -1
index dda1946e84dd..ee9574da53c0 100644
@@ -29,7 +29,9 @@ void __init timer_probe(void)
 
 		ret = init_func_ret(np);
 		if (ret) {
-			pr_err("Failed to initialize '%pOF': %d\n", np, ret);
+			if (ret != -EPROBE_DEFER)
+				pr_err("Failed to initialize '%pOF': %d\n", np,
+				       ret);
 			continue;
 		}
Signature · 1 line
2.17.1
Applied
#2 lore raw
In reply to Jon Hunter
Quoted 6 lines · Jon Hunter

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]>

---

Applied, thanks!

Quoted 21 lines
 drivers/clocksource/timer-of.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/clocksource/timer-of.c +4 -2
index 80542289fae7..d8c2bd4391d0 100644
@@ -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);
Signature · 5 lines
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog