iio: adc: xilinx-xadc: Benefit from devm_clk_get_enabled() to simplify
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 8 Aug 2022 20:47:36 +0000 (22:47 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 15 Aug 2022 21:30:02 +0000 (22:30 +0100)
Make use of devm_clk_get_enabled() to replace some code that effectively
open codes this new function.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20220808204740.307667-9-u.kleine-koenig@pengutronix.de
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/xilinx-xadc-core.c

index 1b24772..292f289 100644 (file)
@@ -1296,13 +1296,6 @@ static const char * const xadc_type_names[] = {
        [XADC_TYPE_US] = "xilinx-system-monitor",
 };
 
-static void xadc_clk_disable_unprepare(void *data)
-{
-       struct clk *clk = data;
-
-       clk_disable_unprepare(clk);
-}
-
 static void xadc_cancel_delayed_work(void *data)
 {
        struct delayed_work *work = data;
@@ -1374,19 +1367,10 @@ static int xadc_probe(struct platform_device *pdev)
                }
        }
 
-       xadc->clk = devm_clk_get(dev, NULL);
+       xadc->clk = devm_clk_get_enabled(dev, NULL);
        if (IS_ERR(xadc->clk))
                return PTR_ERR(xadc->clk);
 
-       ret = clk_prepare_enable(xadc->clk);
-       if (ret)
-               return ret;
-
-       ret = devm_add_action_or_reset(dev,
-                                      xadc_clk_disable_unprepare, xadc->clk);
-       if (ret)
-               return ret;
-
        /*
         * Make sure not to exceed the maximum samplerate since otherwise the
         * resulting interrupt storm will soft-lock the system.