aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier@osg.samsung.com>2016-03-14 21:38:38 -0400
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-03-18 19:00:12 -0400
commitae6e00b4c01f701a9a268adf35371c018396cd05 (patch)
tree4209918521d0a4bb02d83cf7302df4ef6e9a1508
parent399221ccf45106455c163bb34b4e66256c0ae233 (diff)
rtc: s3c: Don't print an error on probe deferral
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>
-rw-r--r--drivers/rtc/rtc-s3c.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index ffb860d18701..d01ad7e8078e 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -501,18 +501,27 @@ static int s3c_rtc_probe(struct platform_device *pdev)
501 501
502 info->rtc_clk = devm_clk_get(&pdev->dev, "rtc"); 502 info->rtc_clk = devm_clk_get(&pdev->dev, "rtc");
503 if (IS_ERR(info->rtc_clk)) { 503 if (IS_ERR(info->rtc_clk)) {
504 dev_err(&pdev->dev, "failed to find rtc clock\n"); 504 ret = PTR_ERR(info->rtc_clk);
505 return PTR_ERR(info->rtc_clk); 505 if (ret != -EPROBE_DEFER)
506 dev_err(&pdev->dev, "failed to find rtc clock\n");
507 else
508 dev_dbg(&pdev->dev, "probe deferred due to missing rtc clk\n");
509 return ret;
506 } 510 }
507 clk_prepare_enable(info->rtc_clk); 511 clk_prepare_enable(info->rtc_clk);
508 512
509 if (info->data->needs_src_clk) { 513 if (info->data->needs_src_clk) {
510 info->rtc_src_clk = devm_clk_get(&pdev->dev, "rtc_src"); 514 info->rtc_src_clk = devm_clk_get(&pdev->dev, "rtc_src");
511 if (IS_ERR(info->rtc_src_clk)) { 515 if (IS_ERR(info->rtc_src_clk)) {
512 dev_err(&pdev->dev, 516 ret = PTR_ERR(info->rtc_src_clk);
513 "failed to find rtc source clock\n"); 517 if (ret != -EPROBE_DEFER)
518 dev_err(&pdev->dev,
519 "failed to find rtc source clock\n");
520 else
521 dev_dbg(&pdev->dev,
522 "probe deferred due to missing rtc src clk\n");
514 clk_disable_unprepare(info->rtc_clk); 523 clk_disable_unprepare(info->rtc_clk);
515 return PTR_ERR(info->rtc_src_clk); 524 return ret;
516 } 525 }
517 clk_prepare_enable(info->rtc_src_clk); 526 clk_prepare_enable(info->rtc_src_clk);
518 } 527 }