| Message ID | 20190920075723.28293-1-alexandru.ardelean@analog.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RESEND] iio: tcs3414: fix iio_triggered_buffer_{pre,post}enable positions | expand |
On Fri, 20 Sep 2019 10:57:23 +0300 Alexandru Ardelean <alexandru.ardelean@analog.com> wrote: > The iio_triggered_buffer_{predisable,postenable} functions attach/detach > the poll functions. > > For the predisable hook, the disable code should occur before detaching > the poll func, and for the postenable hook, the poll func should be > attached before the enable code. > > The driver was slightly reworked. The preenable hook was moved to the > postenable, to add some symmetry to the postenable/predisable part. > > Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> Seem's Peter is busy or missed this one. Still time to send a review though as I won't push out a non rebasing tree for at least a week. Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/iio/light/tcs3414.c | 30 ++++++++++++++++++++---------- > 1 file changed, 20 insertions(+), 10 deletions(-) > > diff --git a/drivers/iio/light/tcs3414.c b/drivers/iio/light/tcs3414.c > index 7c0291c5fe76..b542e5619ead 100644 > --- a/drivers/iio/light/tcs3414.c > +++ b/drivers/iio/light/tcs3414.c > @@ -240,32 +240,42 @@ static const struct iio_info tcs3414_info = { > .attrs = &tcs3414_attribute_group, > }; > > -static int tcs3414_buffer_preenable(struct iio_dev *indio_dev) > +static int tcs3414_buffer_postenable(struct iio_dev *indio_dev) > { > struct tcs3414_data *data = iio_priv(indio_dev); > + int ret; > + > + ret = iio_triggered_buffer_postenable(indio_dev); > + if (ret) > + return ret; > > data->control |= TCS3414_CONTROL_ADC_EN; > - return i2c_smbus_write_byte_data(data->client, TCS3414_CONTROL, > + ret = i2c_smbus_write_byte_data(data->client, TCS3414_CONTROL, > data->control); > + if (ret) > + iio_triggered_buffer_predisable(indio_dev); > + > + return ret; > } > > static int tcs3414_buffer_predisable(struct iio_dev *indio_dev) > { > struct tcs3414_data *data = iio_priv(indio_dev); > - int ret; > - > - ret = iio_triggered_buffer_predisable(indio_dev); > - if (ret < 0) > - return ret; > + int ret, ret2; > > data->control &= ~TCS3414_CONTROL_ADC_EN; > - return i2c_smbus_write_byte_data(data->client, TCS3414_CONTROL, > + ret = i2c_smbus_write_byte_data(data->client, TCS3414_CONTROL, > data->control); > + > + ret2 = iio_triggered_buffer_predisable(indio_dev); > + if (!ret) > + ret = ret2; > + > + return ret; > } > > static const struct iio_buffer_setup_ops tcs3414_buffer_setup_ops = { > - .preenable = tcs3414_buffer_preenable, > - .postenable = &iio_triggered_buffer_postenable, > + .postenable = tcs3414_buffer_postenable, > .predisable = tcs3414_buffer_predisable, > }; >
diff --git a/drivers/iio/light/tcs3414.c b/drivers/iio/light/tcs3414.c index 7c0291c5fe76..b542e5619ead 100644 --- a/drivers/iio/light/tcs3414.c +++ b/drivers/iio/light/tcs3414.c @@ -240,32 +240,42 @@ static const struct iio_info tcs3414_info = { .attrs = &tcs3414_attribute_group, }; -static int tcs3414_buffer_preenable(struct iio_dev *indio_dev) +static int tcs3414_buffer_postenable(struct iio_dev *indio_dev) { struct tcs3414_data *data = iio_priv(indio_dev); + int ret; + + ret = iio_triggered_buffer_postenable(indio_dev); + if (ret) + return ret; data->control |= TCS3414_CONTROL_ADC_EN; - return i2c_smbus_write_byte_data(data->client, TCS3414_CONTROL, + ret = i2c_smbus_write_byte_data(data->client, TCS3414_CONTROL, data->control); + if (ret) + iio_triggered_buffer_predisable(indio_dev); + + return ret; } static int tcs3414_buffer_predisable(struct iio_dev *indio_dev) { struct tcs3414_data *data = iio_priv(indio_dev); - int ret; - - ret = iio_triggered_buffer_predisable(indio_dev); - if (ret < 0) - return ret; + int ret, ret2; data->control &= ~TCS3414_CONTROL_ADC_EN; - return i2c_smbus_write_byte_data(data->client, TCS3414_CONTROL, + ret = i2c_smbus_write_byte_data(data->client, TCS3414_CONTROL, data->control); + + ret2 = iio_triggered_buffer_predisable(indio_dev); + if (!ret) + ret = ret2; + + return ret; } static const struct iio_buffer_setup_ops tcs3414_buffer_setup_ops = { - .preenable = tcs3414_buffer_preenable, - .postenable = &iio_triggered_buffer_postenable, + .postenable = tcs3414_buffer_postenable, .predisable = tcs3414_buffer_predisable, };
The iio_triggered_buffer_{predisable,postenable} functions attach/detach the poll functions. For the predisable hook, the disable code should occur before detaching the poll func, and for the postenable hook, the poll func should be attached before the enable code. The driver was slightly reworked. The preenable hook was moved to the postenable, to add some symmetry to the postenable/predisable part. Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> --- drivers/iio/light/tcs3414.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-)