linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: Alison Schofield <amsfield22@gmail.com>
Cc: Michael.Hennerich@analog.com, knaack.h@gmx.de, lars@metafoo.de,
	pmeerw@pmeerw.net, linux-iio@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] iio: adc: ad7298: use iio helper function to guarantee direct mode
Date: Sun, 24 Jul 2016 12:44:33 +0100	[thread overview]
Message-ID: <a74b6191-1e2e-3ce3-83d8-e0ac39430357@kernel.org> (raw)
In-Reply-To: <20160718193408.GA3854@d830.WORKGROUP>

On 18/07/16 20:34, Alison Schofield wrote:
> Replace the code that guarantees the device stays in direct mode
> with iio_device_claim_direct_mode() which does same.
> 
> Signed-off-by: Alison Schofield <amsfield22@gmail.com>
> Cc: Daniel Baluta <daniel.baluta@gmail.com>
Applied to the togreg branch of iio.git - initially pushed
out as testing.

If Lars or Michael has a chance to look at these as well,
I can easily enough pull them or add Acks etc for now.

Jonathan
> ---
>  drivers/iio/adc/ad7298.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/iio/adc/ad7298.c b/drivers/iio/adc/ad7298.c
> index 10ec8fc..e399bf0 100644
> --- a/drivers/iio/adc/ad7298.c
> +++ b/drivers/iio/adc/ad7298.c
> @@ -239,16 +239,16 @@ static int ad7298_read_raw(struct iio_dev *indio_dev,
>  
>  	switch (m) {
>  	case IIO_CHAN_INFO_RAW:
> -		mutex_lock(&indio_dev->mlock);
> -		if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) {
> -			ret = -EBUSY;
> -		} else {
> -			if (chan->address == AD7298_CH_TEMP)
> -				ret = ad7298_scan_temp(st, val);
> -			else
> -				ret = ad7298_scan_direct(st, chan->address);
> -		}
> -		mutex_unlock(&indio_dev->mlock);
> +		ret = iio_device_claim_direct_mode(indio_dev);
> +		if (ret)
> +			return ret;
> +
> +		if (chan->address == AD7298_CH_TEMP)
> +			ret = ad7298_scan_temp(st, val);
> +		else
> +			ret = ad7298_scan_direct(st, chan->address);
> +
> +		iio_device_release_direct_mode(indio_dev);
>  
>  		if (ret < 0)
>  			return ret;
> 


      reply	other threads:[~2016-07-24 11:44 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-18 19:34 [PATCH] iio: adc: ad7298: use iio helper function to guarantee direct mode Alison Schofield
2016-07-24 11:44 ` Jonathan Cameron [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a74b6191-1e2e-3ce3-83d8-e0ac39430357@kernel.org \
    --to=jic23@kernel.org \
    --cc=Michael.Hennerich@analog.com \
    --cc=amsfield22@gmail.com \
    --cc=knaack.h@gmx.de \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmeerw@pmeerw.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).