diff options
| author | Alison Schofield <amsfield22@gmail.com> | 2016-07-18 21:34:17 +0200 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2016-07-24 20:58:42 +0200 |
| commit | d02ec00d00a5eb5e0ca8ef6ddf0a3774adb52b6a (patch) | |
| tree | 5e018760c1410a572dd6ff385eaed64ba02cc148 /drivers/iio/adc/ad7298.c | |
| parent | iio: adc: ad7793: use iio helper function to guarantee direct mode (diff) | |
| download | linux-d02ec00d00a5eb5e0ca8ef6ddf0a3774adb52b6a.tar.xz linux-d02ec00d00a5eb5e0ca8ef6ddf0a3774adb52b6a.zip | |
iio: adc: ad7298: use iio helper function to guarantee direct mode
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>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/adc/ad7298.c')
| -rw-r--r-- | drivers/iio/adc/ad7298.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/iio/adc/ad7298.c b/drivers/iio/adc/ad7298.c index 10ec8fce395f..e399bf04c73a 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; |