]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: adc: ad9467: Benefit from devm_clk_get_enabled() to simplify
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 8 Aug 2022 20:47:30 +0000 (22:47 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jan 2024 22:52:51 +0000 (14:52 -0800)
[ Upstream commit cdd07b3ab94a020570132558442a26e74b70bc42 ]

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-3-u.kleine-koenig@pengutronix.de
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Stable-dep-of: 76f028539cf3 ("iio: adc: ad9467: fix reset gpio handling")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/iio/adc/ad9467.c

index dbfc8517cb8ab445143b467b22aaf79269b11707..a07df0fd332999272c2741ee6b2a6f899b2fd0c6 100644 (file)
@@ -378,13 +378,6 @@ static int ad9467_preenable_setup(struct adi_axi_adc_conv *conv)
        return ad9467_outputmode_set(st->spi, st->output_mode);
 }
 
-static void ad9467_clk_disable(void *data)
-{
-       struct ad9467_state *st = data;
-
-       clk_disable_unprepare(st->clk);
-}
-
 static int ad9467_probe(struct spi_device *spi)
 {
        const struct ad9467_chip_info *info;
@@ -404,18 +397,10 @@ static int ad9467_probe(struct spi_device *spi)
        st = adi_axi_adc_conv_priv(conv);
        st->spi = spi;
 
-       st->clk = devm_clk_get(&spi->dev, "adc-clk");
+       st->clk = devm_clk_get_enabled(&spi->dev, "adc-clk");
        if (IS_ERR(st->clk))
                return PTR_ERR(st->clk);
 
-       ret = clk_prepare_enable(st->clk);
-       if (ret < 0)
-               return ret;
-
-       ret = devm_add_action_or_reset(&spi->dev, ad9467_clk_disable, st);
-       if (ret)
-               return ret;
-
        st->pwrdown_gpio = devm_gpiod_get_optional(&spi->dev, "powerdown",
                                                   GPIOD_OUT_LOW);
        if (IS_ERR(st->pwrdown_gpio))