On Mon, 17 Jul 2017 01:02:45 +0900
Akinobu Mita <akinobu.mita@xxxxxxxxx> wrote:
> 2017-07-15 21:28 GMT+09:00 Jonathan Cameron <jic23@xxxxxxxxxx>:
> > On Thu, 13 Jul 2017 01:32:02 +0900
> > Akinobu Mita <akinobu.mita@xxxxxxxxx> wrote:
> >
> >> Use devm_iio_triggered_buffer_setup to simplify the error path in the
> >> probe() and remove() function.
> >>
> >> Cc: Daniel Baluta <daniel.baluta@xxxxxxxxx>
> >> Cc: Jonathan Cameron <jic23@xxxxxxxxxx>
> >> Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
> >> ---
> >> drivers/iio/adc/ti-ads1015.c | 17 +++++------------
> >> 1 file changed, 5 insertions(+), 12 deletions(-)
> >>
> >> diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
> >> index f5f256a..821e649 100644
> >> --- a/drivers/iio/adc/ti-ads1015.c
> >> +++ b/drivers/iio/adc/ti-ads1015.c
> >> @@ -620,9 +620,9 @@ static int ads1015_probe(struct i2c_client *client,
> >> return PTR_ERR(data->regmap);
> >> }
> >>
> >> - ret = iio_triggered_buffer_setup(indio_dev, NULL,
> >> - ads1015_trigger_handler,
> >> - &ads1015_buffer_setup_ops);
> >> + ret = devm_iio_triggered_buffer_setup(&client->dev, indio_dev, NULL,
> >> + ads1015_trigger_handler,
> >> + &ads1015_buffer_setup_ops);
> >> if (ret < 0) {
> >> dev_err(&client->dev, "iio triggered buffer setup failed\n");
> >> return ret;
> >> @@ -636,7 +636,7 @@ static int ads1015_probe(struct i2c_client *client,
> >>
> >> ret = pm_runtime_set_active(&client->dev);
> >> if (ret)
> >> - goto err_buffer_cleanup;
> >> + return ret;
> >> pm_runtime_set_autosuspend_delay(&client->dev, ADS1015_SLEEP_DELAY_MS);
> >> pm_runtime_use_autosuspend(&client->dev);
> >> pm_runtime_enable(&client->dev);
> >> @@ -644,15 +644,10 @@ static int ads1015_probe(struct i2c_client *client,
> >> ret = iio_device_register(indio_dev);
> >> if (ret < 0) {
> >> dev_err(&client->dev, "Failed to register IIO device\n");
> >> - goto err_buffer_cleanup;
> >> + return ret;
> >> }
> >>
> >> return 0;
> >> -
> >> -err_buffer_cleanup:
> >> - iio_triggered_buffer_cleanup(indio_dev);
> >> -
> >> - return ret;
> >> }
> >>
> >> static int ads1015_remove(struct i2c_client *client)
> >> @@ -666,8 +661,6 @@ static int ads1015_remove(struct i2c_client *client)
> >> pm_runtime_set_suspended(&client->dev);
> >> pm_runtime_put_noidle(&client->dev);
> >>
> >> - iio_triggered_buffer_cleanup(indio_dev);
> >> -
> >> /* power down single shot mode */
> >> return ads1015_set_conv_mode(data, ADS1015_SINGLESHOT);
> > Hmm. This does technically change the remove order to not quite be
> > the reverse of probe.. So I'm not keen from the 'obviously
> > right' angle rather than because I actually think there is any
> > problem with doing this.
>
> Yes, this patch changes the remove order. But the end result of this
> change does the reverse of probe, doesn't it? or am I missing something?
ah. I failed to note the ordering was wrong previously!
This is fine then.
Jonathan
>
> ads1015_probe
> - ...
> - devm_regmap_init_i2c
> - devm_iio_triggered_buffer_setup
> - ads1015_set_conv_mode(CONTINUOUS)
> - pm_runtime_*
> - iio_device_register
>
> ads1015_remove
> - iio_device_unregister
> - pm_runtime_*
> - ads1015_set_conv_mode(SINGLESHOT)
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
