> -----Original Message----- > From: Miquel Raynal <miquel.raynal@xxxxxxxxxxx> > Sent: Wednesday, August 18, 2021 1:12 PM > To: Jonathan Cameron <jic23@xxxxxxxxxx>; Lars-Peter Clausen > <lars@xxxxxxxxxx> > Cc: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxx>; linux- > iio@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; Miquel Raynal > <miquel.raynal@xxxxxxxxxxx> > Subject: [PATCH 14/16] iio: adc: max1027: Consolidate the end of > conversion helper > > [External] > > Now that we have a dedicated handler for End Of Conversion > interrupts, > let's create a second path: > - Situation 1: we are using the external hardware trigger, a conversion > has been triggered and the ADC pushed the data to its FIFO, we need > to > retrieve the data and push it to the IIO buffers. > - Situation 2: we are not using the external hardware trigger, hence we > are likely waiting in a blocked thread waiting for this interrupt to > happen: in this case we just wake up the waiting thread. > > Signed-off-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx> > --- > drivers/iio/adc/max1027.c | 20 +++++++++++++++++--- > 1 file changed, 17 insertions(+), 3 deletions(-) > > diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c > index 8d86e77fb5db..8c5995ae59f2 100644 > --- a/drivers/iio/adc/max1027.c > +++ b/drivers/iio/adc/max1027.c > @@ -235,6 +235,7 @@ struct max1027_state { > struct iio_trigger *trig; > __be16 *buffer; > struct mutex lock; > + bool data_rdy; > bool cnvst_trigger; > u8 reg ____cacheline_aligned; > }; > @@ -243,12 +244,22 @@ static > DECLARE_WAIT_QUEUE_HEAD(max1027_queue); > static int max1027_wait_eoc(struct iio_dev *indio_dev) > { > + struct max1027_state *st = iio_priv(indio_dev); > unsigned int conversion_time = > MAX1027_CONVERSION_UDELAY; > + int ret; > > - if (indio_dev->active_scan_mask) > - conversion_time *= hweight32(*indio_dev- > >active_scan_mask); > + if (st->spi->irq) { Wouldn't it be more clear looking at 'st-> cnvst_trigger'? since that is what we are using the wake up or nor the waiters... - Nuno Sá > + ret = > wait_event_interruptible_timeout(max1027_queue, > + st->data_rdy, HZ / > 1000); > + st->data_rdy = false; > + if (ret == -ERESTARTSYS) > + return ret; > + } else { > + if (indio_dev->active_scan_mask) > + conversion_time *= hweight32(*indio_dev- > >active_scan_mask); > > - usleep_range(conversion_time, conversion_time * 2); > + usleep_range(conversion_time, conversion_time * 2); > + } > > return 0; > } > @@ -481,6 +492,9 @@ static irqreturn_t max1027_eoc_irq_handler(int > irq, void *private) > if (st->cnvst_trigger) { > ret = max1027_read_scan(indio_dev); > iio_trigger_notify_done(indio_dev->trig); > + } else { > + st->data_rdy = true; > + wake_up(&max1027_queue); > } > > if (ret) > -- > 2.27.0