| Message ID | 20181211191207.21900-4-dmurphy@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/4] iio: ti-ads124s08: Add DT binding documentation | expand |
On Tue, 11 Dec 2018 13:12:07 -0600 Dan Murphy <dmurphy@ti.com> wrote: > Migrate the driver to use the devm IIO calls as opposed to > the unmanaged calls. > > Signed-off-by: Dan Murphy <dmurphy@ti.com> The remove order should always be the opposite of probe. As devm cleanup is done 'after' whatever is in the remove function you should never mix and match between managed and unmanaged. That's not to say this can't be done, but it should also handle the regulator disables. For that devm_add_action_or_reset is what you want. As you need to check the regulator is not an error, you would need a little utility function. Jonathan > --- > > v2 - New patch > > drivers/iio/adc/ti-ads8688.c | 17 +++++++---------- > 1 file changed, 7 insertions(+), 10 deletions(-) > > diff --git a/drivers/iio/adc/ti-ads8688.c b/drivers/iio/adc/ti-ads8688.c > index 3597bc0697ee..8f42103a1fd9 100644 > --- a/drivers/iio/adc/ti-ads8688.c > +++ b/drivers/iio/adc/ti-ads8688.c > @@ -462,21 +462,21 @@ static int ads8688_probe(struct spi_device *spi) > > mutex_init(&st->lock); > > - ret = iio_triggered_buffer_setup(indio_dev, NULL, ads8688_trigger_handler, NULL); > + ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, NULL, > + ads8688_trigger_handler, NULL); > if (ret < 0) { > dev_err(&spi->dev, "iio triggered buffer setup failed\n"); > goto err_regulator_disable; > } > > - ret = iio_device_register(indio_dev); > - if (ret) > - goto err_buffer_cleanup; > + ret = devm_iio_device_register(&spi->dev, indio_dev); > + if (ret < 0) { > + dev_err(&spi->dev, "iio device registration failed\n"); > + goto err_regulator_disable; > + } > > return 0; > > -err_buffer_cleanup: > - iio_triggered_buffer_cleanup(indio_dev); > - > err_regulator_disable: > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); > @@ -489,9 +489,6 @@ static int ads8688_remove(struct spi_device *spi) > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ads8688_state *st = iio_priv(indio_dev); > > - iio_device_unregister(indio_dev); > - iio_triggered_buffer_cleanup(indio_dev); > - > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); >
diff --git a/drivers/iio/adc/ti-ads8688.c b/drivers/iio/adc/ti-ads8688.c index 3597bc0697ee..8f42103a1fd9 100644 --- a/drivers/iio/adc/ti-ads8688.c +++ b/drivers/iio/adc/ti-ads8688.c @@ -462,21 +462,21 @@ static int ads8688_probe(struct spi_device *spi) mutex_init(&st->lock); - ret = iio_triggered_buffer_setup(indio_dev, NULL, ads8688_trigger_handler, NULL); + ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, NULL, + ads8688_trigger_handler, NULL); if (ret < 0) { dev_err(&spi->dev, "iio triggered buffer setup failed\n"); goto err_regulator_disable; } - ret = iio_device_register(indio_dev); - if (ret) - goto err_buffer_cleanup; + ret = devm_iio_device_register(&spi->dev, indio_dev); + if (ret < 0) { + dev_err(&spi->dev, "iio device registration failed\n"); + goto err_regulator_disable; + } return 0; -err_buffer_cleanup: - iio_triggered_buffer_cleanup(indio_dev); - err_regulator_disable: if (!IS_ERR(st->reg)) regulator_disable(st->reg); @@ -489,9 +489,6 @@ static int ads8688_remove(struct spi_device *spi) struct iio_dev *indio_dev = spi_get_drvdata(spi); struct ads8688_state *st = iio_priv(indio_dev); - iio_device_unregister(indio_dev); - iio_triggered_buffer_cleanup(indio_dev); - if (!IS_ERR(st->reg)) regulator_disable(st->reg);
Migrate the driver to use the devm IIO calls as opposed to the unmanaged calls. Signed-off-by: Dan Murphy <dmurphy@ti.com> --- v2 - New patch drivers/iio/adc/ti-ads8688.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) -- 2.20.0.rc2.7.g965798d1f2