From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net ([212.227.17.22]:64214 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751701AbbGaXyr (ORCPT ); Fri, 31 Jul 2015 19:54:47 -0400 Message-ID: <55BC0ABF.5080204@gmx.de> Date: Sat, 01 Aug 2015 01:54:39 +0200 From: Hartmut Knaack MIME-Version: 1.0 To: linux-iio@vger.kernel.org CC: Jonathan Cameron , Lars-Peter Clausen , Peter Meerwald , Antoine Tenart Subject: Re: [PATCH v2 7/8] iio:adc:berlin2-adc: enable interrupts with mutex locked References: <0c150ffa3c97b5dc7b691efa8ba474e43c282519.1438035998.git.knaack.h@gmx.de> In-Reply-To: <0c150ffa3c97b5dc7b691efa8ba474e43c282519.1438035998.git.knaack.h@gmx.de> Content-Type: text/plain; charset=ISO-8859-15 Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org Antoine, any opinion about this one? Hartmut Knaack schrieb am 28.07.2015 um 00:39: > Move the call to enable channel interrupts into its _read() function to > have it protected by a mutex. This ensures that only one channel is > sampled at a time. > > Signed-off-by: Hartmut Knaack > --- > drivers/iio/adc/berlin2-adc.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/drivers/iio/adc/berlin2-adc.c b/drivers/iio/adc/berlin2-adc.c > index 6e20c856f479..13cfeb494e34 100644 > --- a/drivers/iio/adc/berlin2-adc.c > +++ b/drivers/iio/adc/berlin2-adc.c > @@ -111,6 +111,10 @@ static int berlin2_adc_read(struct iio_dev *indio_dev, int channel) > > mutex_lock(&priv->lock); > > + /* Enable the interrupts */ > + regmap_write(priv->regmap, BERLIN2_SM_ADC_STATUS, > + BERLIN2_SM_ADC_STATUS_INT_EN(channel)); > + > /* Configure the ADC */ > regmap_update_bits(priv->regmap, BERLIN2_SM_CTRL, > BERLIN2_SM_CTRL_ADC_RESET | BERLIN2_SM_CTRL_ADC_SEL_MASK > @@ -149,6 +153,10 @@ static int berlin2_adc_tsen_read(struct iio_dev *indio_dev) > > mutex_lock(&priv->lock); > > + /* Enable interrupts */ > + regmap_write(priv->regmap, BERLIN2_SM_TSEN_STATUS, > + BERLIN2_SM_TSEN_STATUS_INT_EN); > + > /* Configure the ADC */ > regmap_update_bits(priv->regmap, BERLIN2_SM_CTRL, > BERLIN2_SM_CTRL_TSEN_RESET | BERLIN2_SM_CTRL_ADC_ROTATE, > @@ -190,7 +198,6 @@ static int berlin2_adc_read_raw(struct iio_dev *indio_dev, > struct iio_chan_spec const *chan, int *val, int *val2, > long mask) > { > - struct berlin2_adc_priv *priv = iio_priv(indio_dev); > int temp; > > switch (mask) { > @@ -198,10 +205,6 @@ static int berlin2_adc_read_raw(struct iio_dev *indio_dev, > if (chan->type != IIO_VOLTAGE) > return -EINVAL; > > - /* Enable the interrupts */ > - regmap_write(priv->regmap, BERLIN2_SM_ADC_STATUS, > - BERLIN2_SM_ADC_STATUS_INT_EN(chan->channel)); > - > *val = berlin2_adc_read(indio_dev, chan->channel); > if (*val < 0) > return *val; > @@ -211,10 +214,6 @@ static int berlin2_adc_read_raw(struct iio_dev *indio_dev, > if (chan->type != IIO_TEMP) > return -EINVAL; > > - /* Enable interrupts */ > - regmap_write(priv->regmap, BERLIN2_SM_TSEN_STATUS, > - BERLIN2_SM_TSEN_STATUS_INT_EN); > - > temp = berlin2_adc_tsen_read(indio_dev); > if (temp < 0) > return temp; >