iio: adc: max1027: Use device-managed APIs
PATCH 1/1 iio: adc: max1027: Use device-managed APIs
Use device-managed APIs to simplify the code.
Signed-off-by Chuhong Yuan <[email protected]>
--- drivers/iio/adc/max1027.c | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-)
drivers/iio/adc/max1027.c +7 -23
@@ -427,8 +427,9 @@ static int max1027_probe(struct spi_device *spi)return -ENOMEM ; } - ret =iio_triggered_buffer_setup (indio_dev, &iio_pollfunc_store_time, - &max1027_trigger_handler,NULL ); + ret =devm_iio_triggered_buffer_setup (&spi->dev, indio_dev, + &iio_pollfunc_store_time, + &max1027_trigger_handler,NULL );if (ret <0 ) {dev_err (&indio_dev->dev,"Failed to setup buffer\n" );return ret;
@@ -439,7 +440,7 @@ static int max1027_probe(struct spi_device *spi)if (st->trig ==NULL ) { ret = -ENOMEM ;dev_err (&indio_dev->dev,"Failed to allocate iio trigger\n" ); - goto fail_trigger_alloc; +return ret; } st->trig->ops = &max1027_trigger_ops;
@@ -454,7 +455,7 @@ static int max1027_probe(struct spi_device *spi) spi->dev.driver->name, st->trig);if (ret <0 ) {dev_err (&indio_dev->dev,"Failed to allocate IRQ.\n" ); - goto fail_dev_register; +return ret; }/* Disable averaging */
@@ -462,33 +463,16 @@ static int max1027_probe(struct spi_device *spi) ret =spi_write (st->spi, &st->reg,1 );if (ret <0 ) {dev_err (&indio_dev->dev,"Failed to configure averaging register\n" ); - goto fail_dev_register; - } - - ret =iio_device_register (indio_dev); -if (ret <0 ) { -dev_err (&indio_dev->dev,"Failed to register iio device\n" ); - goto fail_dev_register; +return ret; } -return 0 ; - -fail_dev_register: -fail_trigger_alloc: -iio_triggered_buffer_cleanup (indio_dev); - -return ret; +return devm_iio_device_register (&spi->dev, indio_dev); }static int max1027_remove (struct spi_device *spi) { -struct iio_dev *indio_dev =spi_get_drvdata (spi); -pr_debug ("%s: remove(spi = 0x%p)\n" , __func__, spi); -iio_device_unregister (indio_dev); -iio_triggered_buffer_cleanup (indio_dev); -return 0 ; }
Signature · 1 line
2.20.1
Jonathan Cameron
maintainer+CC linux-iio
Quoted 3 lines · On Thu, 8 Aug 2019 22:26:46 +0800 Chuhong Yuan <[email protected]> wrote:
Use device-managed APIs to simplify the code.
Signed-off-by Chuhong Yuan <[email protected]>
Also one minor comment inline. I would have picked this up and made that change but given it didn't go to the linux-iio, please do a v2 scrapping the debug print and hence remove.
Thanks,
Jonathan
Quoted 57 lines
--- drivers/iio/adc/max1027.c | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-)drivers/iio/adc/max1027.c +6
-16@@ -427,8 +427,9 @@ static int max1027_probe(struct spi_device *spi)return -ENOMEM ; } - ret =iio_triggered_buffer_setup (indio_dev, &iio_pollfunc_store_time, - &max1027_trigger_handler,NULL ); + ret =devm_iio_triggered_buffer_setup (&spi->dev, indio_dev, + &iio_pollfunc_store_time, + &max1027_trigger_handler,NULL );if (ret <0 ) {dev_err (&indio_dev->dev,"Failed to setup buffer\n" );return ret;@@ -439,7 +440,7 @@ static int max1027_probe(struct spi_device *spi)if (st->trig ==NULL ) { ret = -ENOMEM ;dev_err (&indio_dev->dev,"Failed to allocate iio trigger\n" ); - goto fail_trigger_alloc; +return ret; } st->trig->ops = &max1027_trigger_ops;@@ -454,7 +455,7 @@ static int max1027_probe(struct spi_device *spi) spi->dev.driver->name, st->trig);if (ret <0 ) {dev_err (&indio_dev->dev,"Failed to allocate IRQ.\n" ); - goto fail_dev_register; +return ret; }/* Disable averaging */ @@ -462,33 +463,16 @@ static int max1027_probe(struct spi_device *spi) ret =spi_write (st->spi, &st->reg,1 );if (ret <0 ) {dev_err (&indio_dev->dev,"Failed to configure averaging register\n" ); - goto fail_dev_register; - } - - ret =iio_device_register (indio_dev); -if (ret <0 ) { -dev_err (&indio_dev->dev,"Failed to register iio device\n" ); - goto fail_dev_register; +return ret; } -return 0 ; - -fail_dev_register: -fail_trigger_alloc: -iio_triggered_buffer_cleanup (indio_dev);
drivers/iio/adc/max1027.c static int max1027_probe(struct spi_device *spi) · line 474
Quoted 10 lines
drivers/iio/adc/max1027.c +1
-4- -return ret; +return devm_iio_device_register (&spi->dev, indio_dev); }static int max1027_remove (struct spi_device *spi) { -struct iio_dev *indio_dev =spi_get_drvdata (spi); -pr_debug ("%s: remove(spi = 0x%p)\n" , __func__, spi);
That's not a message we need to keep. Hence can get rid of remove entirely.
Quoted 7 lines
drivers/iio/adc/max1027.c +0
-3-iio_device_unregister (indio_dev); -iio_triggered_buffer_cleanup (indio_dev); -return 0 ; }