OSDN Git Service

rtc: stm32: don't print an error on probe deferral
authorValentin Caron <valentin.caron@foss.st.com>
Wed, 5 Jul 2023 17:43:54 +0000 (19:43 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Thu, 27 Jul 2023 21:03:34 +0000 (23:03 +0200)
Change stm32-rtc driver to not generate an error message when
device probe operation is deferred for a clock.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
Signed-off-by: Valentin Caron <valentin.caron@foss.st.com>
Link: https://lore.kernel.org/r/20230705174357.353616-5-valentin.caron@foss.st.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-stm32.c

index cad8866..5ebf0b8 100644 (file)
@@ -6,6 +6,7 @@
 
 #include <linux/bcd.h>
 #include <linux/clk.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
 #include <linux/mfd/syscon.h>
@@ -759,16 +760,13 @@ static int stm32_rtc_probe(struct platform_device *pdev)
                rtc->rtc_ck = devm_clk_get(&pdev->dev, NULL);
        } else {
                rtc->pclk = devm_clk_get(&pdev->dev, "pclk");
-               if (IS_ERR(rtc->pclk)) {
-                       dev_err(&pdev->dev, "no pclk clock");
-                       return PTR_ERR(rtc->pclk);
-               }
+               if (IS_ERR(rtc->pclk))
+                       return dev_err_probe(&pdev->dev, PTR_ERR(rtc->pclk), "no pclk clock");
+
                rtc->rtc_ck = devm_clk_get(&pdev->dev, "rtc_ck");
        }
-       if (IS_ERR(rtc->rtc_ck)) {
-               dev_err(&pdev->dev, "no rtc_ck clock");
-               return PTR_ERR(rtc->rtc_ck);
-       }
+       if (IS_ERR(rtc->rtc_ck))
+               return dev_err_probe(&pdev->dev, PTR_ERR(rtc->rtc_ck), "no rtc_ck clock");
 
        if (rtc->data->has_pclk) {
                ret = clk_prepare_enable(rtc->pclk);