iio: adc: rockchip_saradc: Make use of devm_clk_get_enabled

Use devm_clk_get_enabled() to avoid manually disabling the
clock.

Signed-off-by: Shreeya Patel <shreeya.patel@collabora.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20230603185340.13838-4-shreeya.patel@collabora.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
index 257f0a80c08dd7d125eb11f1eb5d1f4864d8b4fc..2e8a1a5e5b2cc6d25b6b724691219c2ad7fe169b 100644 (file)
--- a/drivers/iio/adc/rockchip_saradc.c
+++ b/drivers/iio/adc/rockchip_saradc.c
@@ -346,20 +346,6 @@ static void rockchip_saradc_reset_controller(struct reset_control *reset)
        reset_control_deassert(reset);
 }
 
-static void rockchip_saradc_clk_disable(void *data)
-{
-       struct rockchip_saradc *info = data;
-
-       clk_disable_unprepare(info->clk);
-}
-
-static void rockchip_saradc_pclk_disable(void *data)
-{
-       struct rockchip_saradc *info = data;
-
-       clk_disable_unprepare(info->pclk);
-}
-
 static void rockchip_saradc_regulator_disable(void *data)
 {
        struct rockchip_saradc *info = data;
@@ -493,16 +479,6 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
                return ret;
        }
 
-       info->pclk = devm_clk_get(&pdev->dev, "apb_pclk");
-       if (IS_ERR(info->pclk))
-               return dev_err_probe(&pdev->dev, PTR_ERR(info->pclk),
-                                    "failed to get pclk\n");
-
-       info->clk = devm_clk_get(&pdev->dev, "saradc");
-       if (IS_ERR(info->clk))
-               return dev_err_probe(&pdev->dev, PTR_ERR(info->clk),
-                                    "failed to get adc clock\n");
-
        info->vref = devm_regulator_get(&pdev->dev, "vref");
        if (IS_ERR(info->vref))
                return dev_err_probe(&pdev->dev, PTR_ERR(info->vref),
@@ -540,31 +516,15 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
 
        info->uv_vref = ret;
 
-       ret = clk_prepare_enable(info->pclk);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to enable pclk\n");
-               return ret;
-       }
-       ret = devm_add_action_or_reset(&pdev->dev,
-                                      rockchip_saradc_pclk_disable, info);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to register devm action, %d\n",
-                       ret);
-               return ret;
-       }
+       info->pclk = devm_clk_get_enabled(&pdev->dev, "apb_pclk");
+       if (IS_ERR(info->pclk))
+               return dev_err_probe(&pdev->dev, PTR_ERR(info->pclk),
+                                    "failed to get pclk\n");
 
-       ret = clk_prepare_enable(info->clk);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to enable converter clock\n");
-               return ret;
-       }
-       ret = devm_add_action_or_reset(&pdev->dev,
-                                      rockchip_saradc_clk_disable, info);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to register devm action, %d\n",
-                       ret);
-               return ret;
-       }
+       info->clk = devm_clk_get_enabled(&pdev->dev, "saradc");
+       if (IS_ERR(info->clk))
+               return dev_err_probe(&pdev->dev, PTR_ERR(info->clk),
+                                    "failed to get adc clock\n");
 
        platform_set_drvdata(pdev, indio_dev);