| Message ID | 20220407115621.10781-1-maira.canal@usp.br (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] iio: ad7266: convert probe to full device-managed | expand |
On Thu, 7 Apr 2022 08:56:21 -0300 Maíra Canal <maira.canal@usp.br> wrote: > Convert probe functions to device-managed variants, with exception of > the regulator, which required a devm_add_action_or_reset() hook > registration. > > Reviewed-by: Marcelo Schmitt <marcelo.schmitt1@gmail.com> > Reviewed-by: Nuno Sá <nuno.sa@analog.com> > Signed-off-by: Maíra Canal <maira.canal@usp.br> Nice. I tweaked the subject to be iio: adc: ad7266: I don't always remember to ensure subjects are consistent so you will find all sorts of minor variants on the titles in IIO, but ideally it takes the form I've change this one to. Applied to the togreg branch of iio.git which will be initially pushed out as testing to let 0-day see if it can find any problems. If that's fine I'll push it out as togreg later in the week and that gets picked up for linux-next. Thanks, Jonathan > --- > drivers/iio/adc/ad7266.c | 44 +++++++++++++--------------------------- > 1 file changed, 14 insertions(+), 30 deletions(-) > > diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c > index c17d9b5fbaf6..f20d39f0bc01 100644 > --- a/drivers/iio/adc/ad7266.c > +++ b/drivers/iio/adc/ad7266.c > @@ -378,6 +378,11 @@ static const char * const ad7266_gpio_labels[] = { > "ad0", "ad1", "ad2", > }; > > +static void ad7266_reg_disable(void *reg) > +{ > + regulator_disable(reg); > +} > + > static int ad7266_probe(struct spi_device *spi) > { > struct ad7266_platform_data *pdata = spi->dev.platform_data; > @@ -398,9 +403,13 @@ static int ad7266_probe(struct spi_device *spi) > if (ret) > return ret; > > + ret = devm_add_action_or_reset(&spi->dev, ad7266_reg_disable, st->reg); > + if (ret) > + return ret; > + > ret = regulator_get_voltage(st->reg); > if (ret < 0) > - goto error_disable_reg; > + return ret; > > st->vref_mv = ret / 1000; > } else { > @@ -423,7 +432,7 @@ static int ad7266_probe(struct spi_device *spi) > GPIOD_OUT_LOW); > if (IS_ERR(st->gpios[i])) { > ret = PTR_ERR(st->gpios[i]); > - goto error_disable_reg; > + return ret; > } > } > } > @@ -433,7 +442,6 @@ static int ad7266_probe(struct spi_device *spi) > st->mode = AD7266_MODE_DIFF; > } > > - spi_set_drvdata(spi, indio_dev); > st->spi = spi; > > indio_dev->name = spi_get_device_id(spi)->name; > @@ -459,35 +467,12 @@ static int ad7266_probe(struct spi_device *spi) > spi_message_add_tail(&st->single_xfer[1], &st->single_msg); > spi_message_add_tail(&st->single_xfer[2], &st->single_msg); > > - ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time, > + ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, &iio_pollfunc_store_time, > &ad7266_trigger_handler, &iio_triggered_buffer_setup_ops); > if (ret) > - goto error_disable_reg; > - > - ret = iio_device_register(indio_dev); > - if (ret) > - goto error_buffer_cleanup; > - > - return 0; > - > -error_buffer_cleanup: > - iio_triggered_buffer_cleanup(indio_dev); > -error_disable_reg: > - if (!IS_ERR(st->reg)) > - regulator_disable(st->reg); > - > - return ret; > -} > - > -static void ad7266_remove(struct spi_device *spi) > -{ > - struct iio_dev *indio_dev = spi_get_drvdata(spi); > - struct ad7266_state *st = iio_priv(indio_dev); > + return ret; > > - iio_device_unregister(indio_dev); > - iio_triggered_buffer_cleanup(indio_dev); > - if (!IS_ERR(st->reg)) > - regulator_disable(st->reg); > + return devm_iio_device_register(&spi->dev, indio_dev); > } > > static const struct spi_device_id ad7266_id[] = { > @@ -502,7 +487,6 @@ static struct spi_driver ad7266_driver = { > .name = "ad7266", > }, > .probe = ad7266_probe, > - .remove = ad7266_remove, > .id_table = ad7266_id, > }; > module_spi_driver(ad7266_driver);
diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c index c17d9b5fbaf6..f20d39f0bc01 100644 --- a/drivers/iio/adc/ad7266.c +++ b/drivers/iio/adc/ad7266.c @@ -378,6 +378,11 @@ static const char * const ad7266_gpio_labels[] = { "ad0", "ad1", "ad2", }; +static void ad7266_reg_disable(void *reg) +{ + regulator_disable(reg); +} + static int ad7266_probe(struct spi_device *spi) { struct ad7266_platform_data *pdata = spi->dev.platform_data; @@ -398,9 +403,13 @@ static int ad7266_probe(struct spi_device *spi) if (ret) return ret; + ret = devm_add_action_or_reset(&spi->dev, ad7266_reg_disable, st->reg); + if (ret) + return ret; + ret = regulator_get_voltage(st->reg); if (ret < 0) - goto error_disable_reg; + return ret; st->vref_mv = ret / 1000; } else { @@ -423,7 +432,7 @@ static int ad7266_probe(struct spi_device *spi) GPIOD_OUT_LOW); if (IS_ERR(st->gpios[i])) { ret = PTR_ERR(st->gpios[i]); - goto error_disable_reg; + return ret; } } } @@ -433,7 +442,6 @@ static int ad7266_probe(struct spi_device *spi) st->mode = AD7266_MODE_DIFF; } - spi_set_drvdata(spi, indio_dev); st->spi = spi; indio_dev->name = spi_get_device_id(spi)->name; @@ -459,35 +467,12 @@ static int ad7266_probe(struct spi_device *spi) spi_message_add_tail(&st->single_xfer[1], &st->single_msg); spi_message_add_tail(&st->single_xfer[2], &st->single_msg); - ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time, + ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, &iio_pollfunc_store_time, &ad7266_trigger_handler, &iio_triggered_buffer_setup_ops); if (ret) - goto error_disable_reg; - - ret = iio_device_register(indio_dev); - if (ret) - goto error_buffer_cleanup; - - return 0; - -error_buffer_cleanup: - iio_triggered_buffer_cleanup(indio_dev); -error_disable_reg: - if (!IS_ERR(st->reg)) - regulator_disable(st->reg); - - return ret; -} - -static void ad7266_remove(struct spi_device *spi) -{ - struct iio_dev *indio_dev = spi_get_drvdata(spi); - struct ad7266_state *st = iio_priv(indio_dev); + return ret; - iio_device_unregister(indio_dev); - iio_triggered_buffer_cleanup(indio_dev); - if (!IS_ERR(st->reg)) - regulator_disable(st->reg); + return devm_iio_device_register(&spi->dev, indio_dev); } static const struct spi_device_id ad7266_id[] = { @@ -502,7 +487,6 @@ static struct spi_driver ad7266_driver = { .name = "ad7266", }, .probe = ad7266_probe, - .remove = ad7266_remove, .id_table = ad7266_id, }; module_spi_driver(ad7266_driver);