All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alison Schofield <amsfield22@gmail.com>
To: jic23@kernel.org
Cc: lars@metafoo.de, Michael.Hennerich@analog.com, knaack.h@gmx.de,
	pmeerw@pmeerw.net, linux-iio@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 2/7] iio: adc: ad7791: claim direct mode when writing frequency
Date: Tue, 24 May 2016 12:16:57 -0700	[thread overview]
Message-ID: <b115a245427767bd4c2fd4242b7ee04a243008b3.1464115008.git.amsfield22@gmail.com> (raw)
In-Reply-To: <cover.1464115008.git.amsfield22@gmail.com>

Driver was checking for direct mode and trying to lock it, but
left a gap where mode could change before the desired operation.
Use iio_device_claim_direct_mode() to guarantee device stays in
direct mode.

Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Cc: Daniel Baluta <daniel.baluta@gmail.com>
---
 drivers/iio/adc/ad7791.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/iio/adc/ad7791.c b/drivers/iio/adc/ad7791.c
index cf172d58..f7edacc 100644
--- a/drivers/iio/adc/ad7791.c
+++ b/drivers/iio/adc/ad7791.c
@@ -272,24 +272,17 @@ static ssize_t ad7791_write_frequency(struct device *dev,
 	struct ad7791_state *st = iio_priv(indio_dev);
 	int i, ret;
 
-	mutex_lock(&indio_dev->mlock);
-	if (iio_buffer_enabled(indio_dev)) {
-		mutex_unlock(&indio_dev->mlock);
-		return -EBUSY;
-	}
-	mutex_unlock(&indio_dev->mlock);
-
-	ret = -EINVAL;
-
 	for (i = 0; i < ARRAY_SIZE(ad7791_sample_freq_avail); i++) {
 		if (sysfs_streq(ad7791_sample_freq_avail[i], buf)) {
 
-			mutex_lock(&indio_dev->mlock);
+			ret = iio_device_claim_direct_mode(indio_dev);
+			if (ret)
+				return ret;
 			st->filter &= ~AD7791_FILTER_RATE_MASK;
 			st->filter |= i;
 			ad_sd_write_reg(&st->sd, AD7791_REG_FILTER,
 					 sizeof(st->filter), st->filter);
-			mutex_unlock(&indio_dev->mlock);
+			iio_device_release_direct_mode(indio_dev);
 			ret = 0;
 			break;
 		}
-- 
2.1.4

  parent reply	other threads:[~2016-05-24 19:17 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-24 19:15 [PATCH 0/7] iio: adc: clean up claims on direct mode in ad7* drivers Alison Schofield
2016-05-24 19:16 ` [PATCH 1/7] iio: adc: ad7266: claim direct mode during sensor read Alison Schofield
2016-05-25 10:33   ` Daniel Baluta
2016-05-29 17:02     ` Jonathan Cameron
2016-05-24 19:16 ` Alison Schofield [this message]
2016-05-25 10:34   ` [PATCH 2/7] iio: adc: ad7791: claim direct mode when writing frequency Daniel Baluta
2016-05-29 17:06     ` Jonathan Cameron
2016-05-29 17:07       ` Jonathan Cameron
2016-05-31 13:20       ` Lars-Peter Clausen
2016-05-24 19:17 ` [PATCH 3/7] iio: adc: ad7793: " Alison Schofield
2016-05-25 10:36   ` Daniel Baluta
2016-05-29 18:33     ` Jonathan Cameron
2016-05-31 13:21       ` Lars-Peter Clausen
2016-05-24 19:18 ` [PATCH 4/7] iio: adc: ad7476: use iio helper function to guarantee direct mode Alison Schofield
2016-05-25 10:37   ` Daniel Baluta
2016-05-29 18:35     ` Jonathan Cameron
2016-05-24 19:18 ` [PATCH 5/7] iio: adc: ad7887: " Alison Schofield
2016-05-25 10:38   ` Daniel Baluta
2016-05-29 18:35     ` Jonathan Cameron
2016-05-24 19:19 ` [PATCH 6/7] iio: adc: ad7923: " Alison Schofield
2016-05-25 10:41   ` Daniel Baluta
2016-05-29 18:36     ` Jonathan Cameron
2016-05-24 19:20 ` [PATCH 7/7] iio: adc: ad799x: " Alison Schofield
2016-05-25 10:42   ` Daniel Baluta
2016-05-29 18:39     ` Jonathan Cameron

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=b115a245427767bd4c2fd4242b7ee04a243008b3.1464115008.git.amsfield22@gmail.com \
    --to=amsfield22@gmail.com \
    --cc=Michael.Hennerich@analog.com \
    --cc=jic23@kernel.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.