Use devm_clk_get_enabled() instead of clk functions in rtc-xgene. Signed-off-by: Liao Yuanhong <liaoyuanhong@xxxxxxxx> --- v3:Removed erroneous modifications to the resume function. --- drivers/rtc/rtc-xgene.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/rtc/rtc-xgene.c b/drivers/rtc/rtc-xgene.c index f78efc9760c0..fcdb349b7399 100644 --- a/drivers/rtc/rtc-xgene.c +++ b/drivers/rtc/rtc-xgene.c @@ -162,43 +162,33 @@ static int xgene_rtc_probe(struct platform_device *pdev) return ret; } - pdata->clk = devm_clk_get(&pdev->dev, NULL); + pdata->clk = devm_clk_get_enabled(&pdev->dev, NULL); if (IS_ERR(pdata->clk)) { dev_err(&pdev->dev, "Couldn't get the clock for RTC\n"); return -ENODEV; } - ret = clk_prepare_enable(pdata->clk); - if (ret) - return ret; /* Turn on the clock and the crystal */ writel(RTC_CCR_EN, pdata->csr_base + RTC_CCR); ret = device_init_wakeup(&pdev->dev, 1); - if (ret) { - clk_disable_unprepare(pdata->clk); + if (ret) return ret; - } pdata->rtc->ops = &xgene_rtc_ops; pdata->rtc->range_max = U32_MAX; ret = devm_rtc_register_device(pdata->rtc); - if (ret) { - clk_disable_unprepare(pdata->clk); + if (ret) return ret; - } return 0; } static void xgene_rtc_remove(struct platform_device *pdev) { - struct xgene_rtc_dev *pdata = platform_get_drvdata(pdev); - xgene_rtc_alarm_irq_enable(&pdev->dev, 0); device_init_wakeup(&pdev->dev, 0); - clk_disable_unprepare(pdata->clk); } static int __maybe_unused xgene_rtc_suspend(struct device *dev) @@ -220,7 +210,6 @@ static int __maybe_unused xgene_rtc_suspend(struct device *dev) } else { pdata->irq_enabled = xgene_rtc_alarm_irq_enabled(dev); xgene_rtc_alarm_irq_enable(dev, 0); - clk_disable_unprepare(pdata->clk); } return 0; } -- 2.25.1