| From 6baee4bd63f5fdf1716f88e95c21a683e94fe30d Mon Sep 17 00:00:00 2001 |
| From: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Date: Thu, 1 Apr 2021 18:17:57 +0100 |
| Subject: iio:adc:ad7476: Fix remove handling |
| |
| From: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| |
| commit 6baee4bd63f5fdf1716f88e95c21a683e94fe30d upstream. |
| |
| This driver was in an odd half way state between devm based cleanup |
| and manual cleanup (most of which was missing). |
| I would guess something went wrong with a rebase or similar. |
| Anyhow, this basically finishes the job as a precursor to improving |
| the regulator handling. |
| |
| Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Fixes: 4bb2b8f94ace3 ("iio: adc: ad7476: implement devm_add_action_or_reset") |
| Cc: Michael Hennerich <michael.hennerich@analog.com> |
| Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com> |
| Cc: <Stable@vger.kernel.org> |
| Link: https://lore.kernel.org/r/20210401171759.318140-2-jic23@kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/iio/adc/ad7476.c | 18 ++++-------------- |
| 1 file changed, 4 insertions(+), 14 deletions(-) |
| |
| --- a/drivers/iio/adc/ad7476.c |
| +++ b/drivers/iio/adc/ad7476.c |
| @@ -316,25 +316,15 @@ static int ad7476_probe(struct spi_devic |
| spi_message_init(&st->msg); |
| spi_message_add_tail(&st->xfer, &st->msg); |
| |
| - ret = iio_triggered_buffer_setup(indio_dev, NULL, |
| - &ad7476_trigger_handler, NULL); |
| + ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, NULL, |
| + &ad7476_trigger_handler, NULL); |
| if (ret) |
| - goto error_disable_reg; |
| + return ret; |
| |
| if (st->chip_info->reset) |
| st->chip_info->reset(st); |
| |
| - ret = iio_device_register(indio_dev); |
| - if (ret) |
| - goto error_ring_unregister; |
| - return 0; |
| - |
| -error_ring_unregister: |
| - iio_triggered_buffer_cleanup(indio_dev); |
| -error_disable_reg: |
| - regulator_disable(st->reg); |
| - |
| - return ret; |
| + return devm_iio_device_register(&spi->dev, indio_dev); |
| } |
| |
| static const struct spi_device_id ad7476_id[] = { |