watchdog: davinci: add support for deferred probing

Message ID 1479992308-27473-1-git-send-email-t-kristo@ti.com
State New
Headers show

Commit Message

Tero Kristo Nov. 24, 2016, 12:58 p.m.
devm_clk_get can fail with EPROBE_DEFER in case the clock provider is
not ready yet. Handle this case gracefully, rather than dumping out
a huge warning.

Signed-off-by: Tero Kristo <t-kristo@ti.com>

---
 drivers/watchdog/davinci_wdt.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Guenter Roeck Nov. 24, 2016, 3:38 p.m. | #1
On 11/24/2016 04:58 AM, Tero Kristo wrote:
> devm_clk_get can fail with EPROBE_DEFER in case the clock provider is

> not ready yet. Handle this case gracefully, rather than dumping out

> a huge warning.

>

> Signed-off-by: Tero Kristo <t-kristo@ti.com>


Reviewed-by: Guenter Roeck <linux@roeck-us.net>


> ---

>  drivers/watchdog/davinci_wdt.c | 6 +++++-

>  1 file changed, 5 insertions(+), 1 deletion(-)

>

> diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c

> index 17454ca..0e731d7 100644

> --- a/drivers/watchdog/davinci_wdt.c

> +++ b/drivers/watchdog/davinci_wdt.c

> @@ -166,8 +166,12 @@ static int davinci_wdt_probe(struct platform_device *pdev)

>  		return -ENOMEM;

>

>  	davinci_wdt->clk = devm_clk_get(dev, NULL);

> -	if (WARN_ON(IS_ERR(davinci_wdt->clk)))

> +

> +	if (IS_ERR(davinci_wdt->clk)) {

> +		if (PTR_ERR(davinci_wdt->clk) != -EPROBE_DEFER)

> +			dev_err(&pdev->dev, "failed to get clock node\n");

>  		return PTR_ERR(davinci_wdt->clk);

> +	}

>

>  	clk_prepare_enable(davinci_wdt->clk);

>

>


--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 17454ca..0e731d7 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -166,8 +166,12 @@  static int davinci_wdt_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	davinci_wdt->clk = devm_clk_get(dev, NULL);
-	if (WARN_ON(IS_ERR(davinci_wdt->clk)))
+
+	if (IS_ERR(davinci_wdt->clk)) {
+		if (PTR_ERR(davinci_wdt->clk) != -EPROBE_DEFER)
+			dev_err(&pdev->dev, "failed to get clock node\n");
 		return PTR_ERR(davinci_wdt->clk);
+	}
 
 	clk_prepare_enable(davinci_wdt->clk);