Skip to content

Commit

Permalink
iio: adc: ad7298: use iio helper function to guarantee direct mode
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Daniel Baluta <[email protected]>
Signed-off-by: Jonathan Cameron <[email protected]>
  • Loading branch information
AlisonSchofield authored and jic23 committed Jul 24, 2016
1 parent b4d4640 commit d02ec00
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions drivers/iio/adc/ad7298.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d02ec00

Please sign in to comment.