On Tue, 29 Oct 2019 11:58:16 -1000
Jack Andersen <jackoalan@xxxxxxxxx> wrote:
> These changes look fine to me as well.
>
> I no longer have access to a DLN2 for empirical testing, but since this is
> mainly integration improvements with the IIO side of things, it shouldn't make
> a difference for the hardware.
Whilst I have one of these, it'll will be a while before I'm in any position
to test it. Hence let's gamble a tiny bit.
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.
Thanks,
Jonathan
>
>
>
> On Sun, 27 Oct 2019 at 06:56, Jonathan Cameron <jic23@xxxxxxxxxx> wrote:
> >
> > On Wed, 23 Oct 2019 11:26:34 +0300
> > Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx> wrote:
> >
> > > The iio_triggered_buffer_postenable() hook should be called first to
> > > attach the poll function. The iio_triggered_buffer_predisable() hook is
> > > called last (as is it should).
> > >
> > > This change moves iio_triggered_buffer_postenable() to be called first. It
> > > adds iio_triggered_buffer_predisable() on the error paths of the postenable
> > > hook.
> > > For the predisable hook, some code-paths have been changed to make sure
> > > that the iio_triggered_buffer_predisable() hook gets called in case there
> > > is an error before it.
> > >
> > > Signed-off-by: Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx>
> > +CC Jack who wrote the driver.
> >
> > Looks fine to me, but I always like these to sit for a while and ideally get
> > review from the authors / maintainers of the drivers.
> >
> > Thanks,
> >
> > Jonathan
> >
> > > ---
> > > drivers/iio/adc/dln2-adc.c | 20 ++++++++++++++------
> > > 1 file changed, 14 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/drivers/iio/adc/dln2-adc.c b/drivers/iio/adc/dln2-adc.c
> > > index 5fa78c273a25..65c7c9329b1c 100644
> > > --- a/drivers/iio/adc/dln2-adc.c
> > > +++ b/drivers/iio/adc/dln2-adc.c
> > > @@ -524,6 +524,10 @@ static int dln2_adc_triggered_buffer_postenable(struct iio_dev *indio_dev)
> > > u16 conflict;
> > > unsigned int trigger_chan;
> > >
> > > + ret = iio_triggered_buffer_postenable(indio_dev);
> > > + if (ret)
> > > + return ret;
> > > +
> > > mutex_lock(&dln2->mutex);
> > >
> > > /* Enable ADC */
> > > @@ -537,6 +541,7 @@ static int dln2_adc_triggered_buffer_postenable(struct iio_dev *indio_dev)
> > > (int)conflict);
> > > ret = -EBUSY;
> > > }
> > > + iio_triggered_buffer_predisable(indio_dev);
> > > return ret;
> > > }
> > >
> > > @@ -550,6 +555,7 @@ static int dln2_adc_triggered_buffer_postenable(struct iio_dev *indio_dev)
> > > mutex_unlock(&dln2->mutex);
> > > if (ret < 0) {
> > > dev_dbg(&dln2->pdev->dev, "Problem in %s\n", __func__);
> > > + iio_triggered_buffer_predisable(indio_dev);
> > > return ret;
> > > }
> > > } else {
> > > @@ -557,12 +563,12 @@ static int dln2_adc_triggered_buffer_postenable(struct iio_dev *indio_dev)
> > > mutex_unlock(&dln2->mutex);
> > > }
> > >
> > > - return iio_triggered_buffer_postenable(indio_dev);
> > > + return 0;
> > > }
> > >
> > > static int dln2_adc_triggered_buffer_predisable(struct iio_dev *indio_dev)
> > > {
> > > - int ret;
> > > + int ret, ret2;
> > > struct dln2_adc *dln2 = iio_priv(indio_dev);
> > >
> > > mutex_lock(&dln2->mutex);
> > > @@ -577,12 +583,14 @@ static int dln2_adc_triggered_buffer_predisable(struct iio_dev *indio_dev)
> > > ret = dln2_adc_set_port_enabled(dln2, false, NULL);
> > >
> > > mutex_unlock(&dln2->mutex);
> > > - if (ret < 0) {
> > > + if (ret < 0)
> > > dev_dbg(&dln2->pdev->dev, "Problem in %s\n", __func__);
> > > - return ret;
> > > - }
> > >
> > > - return iio_triggered_buffer_predisable(indio_dev);
> > > + ret2 = iio_triggered_buffer_predisable(indio_dev);
> > > + if (ret == 0)
> > > + ret = ret2;
> > > +
> > > + return ret;
> > > }
> > >
> > > static const struct iio_buffer_setup_ops dln2_adc_buffer_setup_ops = {
> >
