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 7/7] iio: adc: ad799x: use iio helper function to guarantee direct mode
Date: Tue, 24 May 2016 12:20:24 -0700 [thread overview]
Message-ID: <2df3d20cdbc9c3294ef91b515dcdfe0ad151bd01.1464115008.git.amsfield22@gmail.com> (raw)
In-Reply-To: <cover.1464115008.git.amsfield22@gmail.com>
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>
---
drivers/iio/adc/ad799x.c | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c
index a3f5254..ec0200d 100644
--- a/drivers/iio/adc/ad799x.c
+++ b/drivers/iio/adc/ad799x.c
@@ -282,12 +282,11 @@ static int ad799x_read_raw(struct iio_dev *indio_dev,
switch (m) {
case IIO_CHAN_INFO_RAW:
- mutex_lock(&indio_dev->mlock);
- if (iio_buffer_enabled(indio_dev))
- ret = -EBUSY;
- else
- ret = ad799x_scan_direct(st, chan->scan_index);
- mutex_unlock(&indio_dev->mlock);
+ ret = iio_device_claim_direct_mode(indio_dev);
+ if (ret)
+ return ret;
+ ret = ad799x_scan_direct(st, chan->scan_index);
+ iio_device_release_direct_mode(indio_dev);
if (ret < 0)
return ret;
@@ -395,11 +394,9 @@ static int ad799x_write_event_config(struct iio_dev *indio_dev,
struct ad799x_state *st = iio_priv(indio_dev);
int ret;
- mutex_lock(&indio_dev->mlock);
- if (iio_buffer_enabled(indio_dev)) {
- ret = -EBUSY;
- goto done;
- }
+ ret = iio_device_claim_direct_mode(indio_dev);
+ if (ret)
+ return ret;
if (state)
st->config |= BIT(chan->scan_index) << AD799X_CHANNEL_SHIFT;
@@ -412,10 +409,7 @@ static int ad799x_write_event_config(struct iio_dev *indio_dev,
st->config &= ~AD7998_ALERT_EN;
ret = ad799x_write_config(st, st->config);
-
-done:
- mutex_unlock(&indio_dev->mlock);
-
+ iio_device_release_direct_mode(indio_dev);
return ret;
}
--
2.1.4
next prev parent reply other threads:[~2016-05-24 19:20 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 ` [PATCH 2/7] iio: adc: ad7791: claim direct mode when writing frequency Alison Schofield
2016-05-25 10:34 ` 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 ` Alison Schofield [this message]
2016-05-25 10:42 ` [PATCH 7/7] iio: adc: ad799x: " 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=2df3d20cdbc9c3294ef91b515dcdfe0ad151bd01.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®