]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
rtc: tegra: Use devm_clk_get_enabled() in probe
authorKartik Rajput <kkartik@nvidia.com>
Fri, 24 Oct 2025 06:49:50 +0000 (12:19 +0530)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 8 Dec 2025 21:26:41 +0000 (22:26 +0100)
Simplify clock management by replacing devm_clk_get() and manual clock
enable/disable with devm_clk_get_enabled(). This also simplifies the
error handling logic. Also remove tegra_rtc_remove() as the clock will
automatically be disabled when the device is unbound from the bus.

Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Kartik Rajput <kkartik@nvidia.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Link: https://patch.msgid.link/20251024064952.775883-1-kkartik@nvidia.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-tegra.c

index 46788db899533d9882d4a9a0364588550f853993..e8c83a6a96b30edf2c0745638b337c4a7edaba0d 100644 (file)
@@ -300,14 +300,10 @@ static int tegra_rtc_probe(struct platform_device *pdev)
        info->rtc->ops = &tegra_rtc_ops;
        info->rtc->range_max = U32_MAX;
 
-       info->clk = devm_clk_get(&pdev->dev, NULL);
+       info->clk = devm_clk_get_enabled(&pdev->dev, NULL);
        if (IS_ERR(info->clk))
                return PTR_ERR(info->clk);
 
-       ret = clk_prepare_enable(info->clk);
-       if (ret < 0)
-               return ret;
-
        /* set context info */
        info->pdev = pdev;
        spin_lock_init(&info->lock);
@@ -324,29 +320,16 @@ static int tegra_rtc_probe(struct platform_device *pdev)
        ret = devm_request_irq(&pdev->dev, info->irq, tegra_rtc_irq_handler,
                               IRQF_TRIGGER_HIGH, dev_name(&pdev->dev),
                               &pdev->dev);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to request interrupt: %d\n", ret);
-               goto disable_clk;
-       }
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret, "failed to request interrupt\n");
 
        ret = devm_rtc_register_device(info->rtc);
        if (ret)
-               goto disable_clk;
+               return ret;
 
        dev_notice(&pdev->dev, "Tegra internal Real Time Clock\n");
 
        return 0;
-
-disable_clk:
-       clk_disable_unprepare(info->clk);
-       return ret;
-}
-
-static void tegra_rtc_remove(struct platform_device *pdev)
-{
-       struct tegra_rtc_info *info = platform_get_drvdata(pdev);
-
-       clk_disable_unprepare(info->clk);
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -399,7 +382,6 @@ static void tegra_rtc_shutdown(struct platform_device *pdev)
 
 static struct platform_driver tegra_rtc_driver = {
        .probe = tegra_rtc_probe,
-       .remove = tegra_rtc_remove,
        .shutdown = tegra_rtc_shutdown,
        .driver = {
                .name = "tegra_rtc",