2019-08-21 17:36:54

by Jon Hunter

Subject: [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(-)

diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c
index 80542289fae7..d8c2bd4391d0 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);
--
2.17.1

2019-08-22 07:06:44

by Daniel Lezcano

Subject: Re: [PATCH 1/2] clocksource/drivers/timer-of: Do not warn on deferred probe

On 21/08/2019 17:02, Jon Hunter wrote:
> 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!

> 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 80542289fae7..d8c2bd4391d0 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);
>


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