diff options
| author | Matt Ranostay | 2016-08-19 22:36:09 +0200 |
|---|---|---|
| committer | Jonathan Cameron | 2016-08-21 12:55:30 +0200 |
| commit | b015b3e32187225ff1265c4b13f84559fd22ecd7 (patch) | |
| tree | 8526054756f162ab6640e0e2ceb2b1845b109e47 /drivers/iio/chemical | |
| parent | iio: adc: ti-adc161s626: add support for TI 1-channel differential ADCs (diff) | |
| download | kernel-qcow2-linux-b015b3e32187225ff1265c4b13f84559fd22ecd7.tar.gz kernel-qcow2-linux-b015b3e32187225ff1265c4b13f84559fd22ecd7.tar.xz kernel-qcow2-linux-b015b3e32187225ff1265c4b13f84559fd22ecd7.zip | |
iio: chemical: atlas-ph-sensor: switch to iio_device_*_direct_mode helpers
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/chemical')
| -rw-r--r-- | drivers/iio/chemical/atlas-ph-sensor.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/iio/chemical/atlas-ph-sensor.c b/drivers/iio/chemical/atlas-ph-sensor.c index ae038a59d256..696875413d10 100644 --- a/drivers/iio/chemical/atlas-ph-sensor.c +++ b/drivers/iio/chemical/atlas-ph-sensor.c @@ -402,15 +402,13 @@ static int atlas_read_raw(struct iio_dev *indio_dev, case IIO_PH: case IIO_CONCENTRATION: case IIO_ELECTRICALCONDUCTIVITY: - mutex_lock(&indio_dev->mlock); + ret = iio_device_claim_direct_mode(indio_dev); + if (ret) + return ret; - if (iio_buffer_enabled(indio_dev)) - ret = -EBUSY; - else - ret = atlas_read_measurement(data, - chan->address, ®); + ret = atlas_read_measurement(data, chan->address, ®); - mutex_unlock(&indio_dev->mlock); + iio_device_release_direct_mode(indio_dev); break; default: ret = -EINVAL; |