On Mon, 17 May 2021 at 10:31, Alexandru Ardelean <aardelean@xxxxxxxxxxx> wrote:
>
> On Sun, 16 May 2021 at 20:26, Jonathan Cameron <jic23@xxxxxxxxxx> wrote:
> >
> > From: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> >
> > Simplifies error handling and lets us drop remove() entirely.
> >
>
// Removed Bogdan's email; it's not working;
Apologies to return on this.
This note can be disregarded, but this patch could do a direct return
for devm_iio_device_register().
It doesn't make much sense to print a failure there as that can be
also viewed via some broader kernel logging.
But it's also fine to leave it.
> Reviewed-by: Alexandru Ardelean <aardelean@xxxxxxxxxxx>
>
>
> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> > Cc: Bogdan Pricop <bogdan.pricop@xxxxxxxxxx>
> > ---
> > drivers/iio/adc/ti-adc108s102.c | 45 +++++++++++----------------------
> > 1 file changed, 15 insertions(+), 30 deletions(-)
> >
> > diff --git a/drivers/iio/adc/ti-adc108s102.c b/drivers/iio/adc/ti-adc108s102.c
> > index 183b2245e89b..db902aef2abe 100644
> > --- a/drivers/iio/adc/ti-adc108s102.c
> > +++ b/drivers/iio/adc/ti-adc108s102.c
> > @@ -215,6 +215,11 @@ static const struct iio_info adc108s102_info = {
> > .update_scan_mode = &adc108s102_update_scan_mode,
> > };
> >
> > +static void adc108s102_reg_disable(void *reg)
> > +{
> > + regulator_disable(reg);
> > +}
> > +
> > static int adc108s102_probe(struct spi_device *spi)
> > {
> > struct adc108s102_state *st;
> > @@ -239,6 +244,10 @@ static int adc108s102_probe(struct spi_device *spi)
> > dev_err(&spi->dev, "Cannot enable vref regulator\n");
> > return ret;
> > }
> > + ret = devm_add_action_or_reset(&spi->dev, adc108s102_reg_disable,
> > + st->reg);
> > + if (ret)
> > + return ret;
> >
> > ret = regulator_get_voltage(st->reg);
> > if (ret < 0) {
> > @@ -249,7 +258,6 @@ static int adc108s102_probe(struct spi_device *spi)
> > st->va_millivolt = ret / 1000;
> > }
> >
> > - spi_set_drvdata(spi, indio_dev);
> > st->spi = spi;
> >
> > indio_dev->name = spi->modalias;
> > @@ -266,40 +274,18 @@ static int adc108s102_probe(struct spi_device *spi)
> > spi_message_init_with_transfers(&st->scan_single_msg,
> > &st->scan_single_xfer, 1);
> >
> > - ret = iio_triggered_buffer_setup(indio_dev, NULL,
> > - &adc108s102_trigger_handler, NULL);
> > + ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, NULL,
> > + &adc108s102_trigger_handler,
> > + NULL);
> > if (ret)
> > - goto error_disable_reg;
> > + return ret;
> >
> > - ret = iio_device_register(indio_dev);
> > - if (ret) {
> > + ret = devm_iio_device_register(&spi->dev, indio_dev);
> > + if (ret)
> > dev_err(&spi->dev, "Failed to register IIO device\n");
> > - goto error_cleanup_triggered_buffer;
> > - }
> > - return 0;
> > -
> > -error_cleanup_triggered_buffer:
> > - iio_triggered_buffer_cleanup(indio_dev);
> > -
> > -error_disable_reg:
> > - regulator_disable(st->reg);
> > -
> > return ret;
> > }
> >
> > -static int adc108s102_remove(struct spi_device *spi)
> > -{
> > - struct iio_dev *indio_dev = spi_get_drvdata(spi);
> > - struct adc108s102_state *st = iio_priv(indio_dev);
> > -
> > - iio_device_unregister(indio_dev);
> > - iio_triggered_buffer_cleanup(indio_dev);
> > -
> > - regulator_disable(st->reg);
> > -
> > - return 0;
> > -}
> > -
> > static const struct of_device_id adc108s102_of_match[] = {
> > { .compatible = "ti,adc108s102" },
> > { }
> > @@ -327,7 +313,6 @@ static struct spi_driver adc108s102_driver = {
> > .acpi_match_table = ACPI_PTR(adc108s102_acpi_ids),
> > },
> > .probe = adc108s102_probe,
> > - .remove = adc108s102_remove,
> > .id_table = adc108s102_id,
> > };
> > module_spi_driver(adc108s102_driver);
> > --
> > 2.31.1
> >
