On Sat, May 8, 2021 at 9:24 PM Jonathan Cameron <jic23@xxxxxxxxxx> wrote:
>
> From: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
>
> As not many steps were not already devm_ managed, use
> devm_add_action_or_reset() to handle the rest.
>
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> Cc: Cc: Alexandru Ardelean <ardeleanalex@xxxxxxxxx>
double Cc: tag here
One minor thought about maybe removing the log spam.
Other than that:
Reviewed-by: Alexandru Ardelean <ardeleanalex@xxxxxxxxx>
> ---
> drivers/iio/adc/ad7124.c | 53 ++++++++++++++++++----------------------
> 1 file changed, 24 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c
> index 9c2401c5848e..deb166d2b645 100644
> --- a/drivers/iio/adc/ad7124.c
> +++ b/drivers/iio/adc/ad7124.c
> @@ -719,6 +719,16 @@ static void ad7124_reg_disable(void *r)
> regulator_disable(r);
> }
>
> +static void ad7124_clk_disable(void *c)
> +{
> + clk_disable_unprepare(c);
> +}
> +
> +static void ad7124_buffer_cleanup(void *idev)
> +{
> + ad_sd_cleanup_buffer_and_trigger(idev);
We never seem to have done a devm_ version for ad_sd_setup_buffer_and_trigger().
> +}
> +
> static int ad7124_probe(struct spi_device *spi)
> {
> const struct ad7124_chip_info *info;
> @@ -740,8 +750,6 @@ static int ad7124_probe(struct spi_device *spi)
>
> ad_sd_init(&st->sd, indio_dev, spi, &ad7124_sigma_delta_info);
>
> - spi_set_drvdata(spi, indio_dev);
> -
> indio_dev->name = st->chip_info->name;
> indio_dev->modes = INDIO_DIRECT_MODE;
> indio_dev->info = &ad7124_info;
> @@ -779,48 +787,36 @@ static int ad7124_probe(struct spi_device *spi)
> if (ret < 0)
> return ret;
>
> + ret = devm_add_action_or_reset(&spi->dev, ad7124_clk_disable, st->mclk);
> + if (ret)
> + return ret;
> +
> ret = ad7124_soft_reset(st);
> if (ret < 0)
> - goto error_clk_disable_unprepare;
> + return ret;
>
> ret = ad7124_check_chip_id(st);
> if (ret)
> - goto error_clk_disable_unprepare;
> + return ret;
>
> ret = ad7124_setup(st);
> if (ret < 0)
> - goto error_clk_disable_unprepare;
> + return ret;
>
> ret = ad_sd_setup_buffer_and_trigger(indio_dev);
> if (ret < 0)
> - goto error_clk_disable_unprepare;
> -
> - ret = iio_device_register(indio_dev);
> - if (ret < 0) {
> - dev_err(&spi->dev, "Failed to register iio device\n");
> - goto error_remove_trigger;
> - }
> + return ret;
>
> - return 0;
> + ret = devm_add_action_or_reset(&spi->dev, ad7124_buffer_cleanup, indio_dev);
> + if (ret)
> + return ret;
>
> -error_remove_trigger:
> - ad_sd_cleanup_buffer_and_trigger(indio_dev);
> -error_clk_disable_unprepare:
> - clk_disable_unprepare(st->mclk);
> + ret = devm_iio_device_register(&spi->dev, indio_dev);
> + if (ret)
> + dev_err(&spi->dev, "Failed to register iio device\n");
I guess Andy may come along and suggest that we remove this log spam
and just do a direct return.
Which would sound like a reasonable idea.
>
> return ret;
> -}
>
> -static int ad7124_remove(struct spi_device *spi)
> -{
> - struct iio_dev *indio_dev = spi_get_drvdata(spi);
> - struct ad7124_state *st = iio_priv(indio_dev);
> -
> - iio_device_unregister(indio_dev);
> - ad_sd_cleanup_buffer_and_trigger(indio_dev);
> - clk_disable_unprepare(st->mclk);
> -
> - return 0;
> }
>
> static const struct of_device_id ad7124_of_match[] = {
> @@ -838,7 +834,6 @@ static struct spi_driver ad71124_driver = {
> .of_match_table = ad7124_of_match,
> },
> .probe = ad7124_probe,
> - .remove = ad7124_remove,
> };
> module_spi_driver(ad71124_driver);
>
> --
> 2.31.1
>
