Skip to content

Commit 0e6f36c

Browse files
tititiou36alexandrebelloni
authored andcommitted
rtc: st-lpc: Simplify clk handling in st_rtc_probe()
Use devm_clk_get_enabled() instead of hand writing it. This simplifies error handling and removes some lines of code. Also use dev_err_probe() which filters -EPROBE_DEFER. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Link: https://lore.kernel.org/r/992dd8c31be0bb5b8a9d8b5e8e94807ab0848a66.1686251455.git.christophe.jaillet@wanadoo.fr Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent 06c6e1b commit 0e6f36c

1 file changed

Lines changed: 5 additions & 11 deletions

File tree

drivers/rtc/rtc-st-lpc.c

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -228,17 +228,13 @@ static int st_rtc_probe(struct platform_device *pdev)
228228
enable_irq_wake(rtc->irq);
229229
disable_irq(rtc->irq);
230230

231-
rtc->clk = devm_clk_get(&pdev->dev, NULL);
232-
if (IS_ERR(rtc->clk)) {
233-
dev_err(&pdev->dev, "Unable to request clock\n");
234-
return PTR_ERR(rtc->clk);
235-
}
236-
237-
clk_prepare_enable(rtc->clk);
231+
rtc->clk = devm_clk_get_enabled(&pdev->dev, NULL);
232+
if (IS_ERR(rtc->clk))
233+
return dev_err_probe(&pdev->dev, PTR_ERR(rtc->clk),
234+
"Unable to request clock\n");
238235

239236
rtc->clkrate = clk_get_rate(rtc->clk);
240237
if (!rtc->clkrate) {
241-
clk_disable_unprepare(rtc->clk);
242238
dev_err(&pdev->dev, "Unable to fetch clock rate\n");
243239
return -EINVAL;
244240
}
@@ -252,10 +248,8 @@ static int st_rtc_probe(struct platform_device *pdev)
252248
do_div(rtc->rtc_dev->range_max, rtc->clkrate);
253249

254250
ret = devm_rtc_register_device(rtc->rtc_dev);
255-
if (ret) {
256-
clk_disable_unprepare(rtc->clk);
251+
if (ret)
257252
return ret;
258-
}
259253

260254
return 0;
261255
}

0 commit comments

Comments
 (0)