rtc: s3c: Don't print an error on probe deferral
authorJavier Martinez Canillas <javier@osg.samsung.com>
Tue, 15 Mar 2016 01:38:38 +0000 (22:38 -0300)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Fri, 18 Mar 2016 23:00:12 +0000 (00:00 +0100)
The clock and source clock looked up by the driver may not be available
just because the clock controller driver was not probed yet so printing
an error in this case is not correct and only adds confusion to users.

However, knowing that a driver's probe was deferred may be useful so it
can be printed as a debug information.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
drivers/rtc/rtc-s3c.c

index ffb860d..d01ad7e 100644 (file)
@@ -501,18 +501,27 @@ static int s3c_rtc_probe(struct platform_device *pdev)
 
        info->rtc_clk = devm_clk_get(&pdev->dev, "rtc");
        if (IS_ERR(info->rtc_clk)) {
-               dev_err(&pdev->dev, "failed to find rtc clock\n");
-               return PTR_ERR(info->rtc_clk);
+               ret = PTR_ERR(info->rtc_clk);
+               if (ret != -EPROBE_DEFER)
+                       dev_err(&pdev->dev, "failed to find rtc clock\n");
+               else
+                       dev_dbg(&pdev->dev, "probe deferred due to missing rtc clk\n");
+               return ret;
        }
        clk_prepare_enable(info->rtc_clk);
 
        if (info->data->needs_src_clk) {
                info->rtc_src_clk = devm_clk_get(&pdev->dev, "rtc_src");
                if (IS_ERR(info->rtc_src_clk)) {
-                       dev_err(&pdev->dev,
-                               "failed to find rtc source clock\n");
+                       ret = PTR_ERR(info->rtc_src_clk);
+                       if (ret != -EPROBE_DEFER)
+                               dev_err(&pdev->dev,
+                                       "failed to find rtc source clock\n");
+                       else
+                               dev_dbg(&pdev->dev,
+                                       "probe deferred due to missing rtc src clk\n");
                        clk_disable_unprepare(info->rtc_clk);
-                       return PTR_ERR(info->rtc_src_clk);
+                       return ret;
                }
                clk_prepare_enable(info->rtc_src_clk);
        }