On Fri, 22 Jul 2022 15:07:21 +0200
Marcus Folkesson <marcus.folkesson@xxxxxxxxx> wrote:
> Keep using managed resources as much as possible.
>
> Signed-off-by: Marcus Folkesson <marcus.folkesson@xxxxxxxxx>
> Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
> ---
> drivers/iio/adc/Kconfig | 2 ++
> drivers/iio/adc/mcp3911.c | 51 ++++++++++++++++++++-------------------
> 2 files changed, 28 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
> index 7fe5930891e0..3b5db59f3931 100644
> --- a/drivers/iio/adc/Kconfig
> +++ b/drivers/iio/adc/Kconfig
> @@ -718,6 +718,8 @@ config MCP3422
> config MCP3911
> tristate "Microchip Technology MCP3911 driver"
> depends on SPI
> + select IIO_BUFFER
> + select IIO_TRIGGERED_BUFFER
This is unrelated to the devm cleanups, so should be in the patch that
introduces the code that needs them (next patch I think).
Thanks,
Jonathan
> help
> Say yes here to build support for Microchip Technology's MCP3911
> analog to digital converter.
> diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
> index 890af7dca62d..00dadb1761dc 100644
> --- a/drivers/iio/adc/mcp3911.c
> +++ b/drivers/iio/adc/mcp3911.c
> @@ -258,6 +258,18 @@ static int mcp3911_config(struct mcp3911 *adc)
> return mcp3911_write(adc, MCP3911_REG_CONFIG, configreg, 2);
> }
>
> +static void mcp3911_cleanup_clock(void *_adc)
> +{
> + struct mcp3911 *adc = _adc;
> + clk_disable_unprepare(adc->clki);
> +}
> +
> +static void mcp3911_cleanup_regulator(void *_adc)
> +{
> + struct mcp3911 *adc = _adc;
> + regulator_disable(adc->vref);
> +}
> +
> static int mcp3911_probe(struct spi_device *spi)
> {
> struct iio_dev *indio_dev;
> @@ -286,6 +298,11 @@ static int mcp3911_probe(struct spi_device *spi)
> ret = regulator_enable(adc->vref);
> if (ret)
> return ret;
> +
> + ret = devm_add_action_or_reset(&spi->dev,
> + mcp3911_cleanup_regulator, adc);
> + if (ret)
> + return ret;
> }
>
> adc->clki = devm_clk_get(&adc->spi->dev, NULL);
> @@ -296,21 +313,25 @@ static int mcp3911_probe(struct spi_device *spi)
> dev_err(&adc->spi->dev,
> "failed to get adc clk (%ld)\n",
> PTR_ERR(adc->clki));
> - ret = PTR_ERR(adc->clki);
> - goto reg_disable;
> + return PTR_ERR(adc->clki);
> }
> } else {
> ret = clk_prepare_enable(adc->clki);
> if (ret < 0) {
> dev_err(&adc->spi->dev,
> "Failed to enable clki: %d\n", ret);
> - goto reg_disable;
> + return ret;
> }
> +
> + ret = devm_add_action_or_reset(&spi->dev,
> + mcp3911_cleanup_clock, adc);
> + if (ret)
> + return ret;
> }
>
> ret = mcp3911_config(adc);
> if (ret)
> - goto clk_disable;
> + return ret;
>
> indio_dev->name = spi_get_device_id(spi)->name;
> indio_dev->modes = INDIO_DIRECT_MODE;
> @@ -322,31 +343,11 @@ static int mcp3911_probe(struct spi_device *spi)
>
> mutex_init(&adc->lock);
>
> - ret = iio_device_register(indio_dev);
> - if (ret)
> - goto clk_disable;
> -
> - return ret;
> -
> -clk_disable:
> - clk_disable_unprepare(adc->clki);
> -reg_disable:
> - if (adc->vref)
> - regulator_disable(adc->vref);
> -
> - return ret;
> + return devm_iio_device_register(&adc->spi->dev, indio_dev);
> }
>
> static void mcp3911_remove(struct spi_device *spi)
> {
> - struct iio_dev *indio_dev = spi_get_drvdata(spi);
> - struct mcp3911 *adc = iio_priv(indio_dev);
> -
> - iio_device_unregister(indio_dev);
> -
> - clk_disable_unprepare(adc->clki);
> - if (adc->vref)
> - regulator_disable(adc->vref);
> }
>
> static const struct of_device_id mcp3911_dt_ids[] = {
