summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlison Schofield <amsfield22@gmail.com>2016-04-06 04:11:31 (GMT)
committerJonathan Cameron <jic23@kernel.org>2016-04-10 13:58:52 (GMT)
commitff5c37e3eae2cdba4aba13dc8c7e840abb41e4bb (patch)
tree79df4b7451120d373827edde95fbf513f8ba4f1c
parentc455e58354adcde7ba1ebf3d753eba9a07cd587d (diff)
downloadlinux-ff5c37e3eae2cdba4aba13dc8c7e840abb41e4bb.tar.xz
staging: iio: ad7606: use iio_device_{claim|release}_direct_mode()
Replace the code that guarantees the device stays in direct mode with iio_device_{claim|release}_direct_mode() which does same. Signed-off-by: Alison Schofield <amsfield22@gmail.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--drivers/staging/iio/adc/ad7606_core.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c
index 6dbc811..f79ee61 100644
--- a/drivers/staging/iio/adc/ad7606_core.c
+++ b/drivers/staging/iio/adc/ad7606_core.c
@@ -88,12 +88,12 @@ static int ad7606_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 = ad7606_scan_direct(indio_dev, chan->address);
- mutex_unlock(&indio_dev->mlock);
+ ret = iio_device_claim_direct_mode(indio_dev);
+ if (ret)
+ return ret;
+
+ ret = ad7606_scan_direct(indio_dev, chan->address);
+ iio_device_release_direct_mode(indio_dev);
if (ret < 0)
return ret;