hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iio: adc: ad799x: 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>
Acked-by: Daniel Baluta <daniel.baluta@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Alison Schofield 2016-05-24 12:20:24 -07:00 committed by Jonathan Cameron
parent 9f57e068e0
commit 1bb86ecb6c
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/iio/adc/ad799x.c
View File

@ -282,12 +282,11 @@ static int ad799x_read_raw(struct iio_dev *indio_dev,
switch (m) { switch (m) {
case IIO_CHAN_INFO_RAW: case IIO_CHAN_INFO_RAW:
mutex_lock(&indio_dev->mlock); ret = iio_device_claim_direct_mode(indio_dev);
if (iio_buffer_enabled(indio_dev)) if (ret)
ret = -EBUSY; return ret;
else ret = ad799x_scan_direct(st, chan->scan_index);
ret = ad799x_scan_direct(st, chan->scan_index); iio_device_release_direct_mode(indio_dev);
mutex_unlock(&indio_dev->mlock);
if (ret < 0) if (ret < 0)
return ret; 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); struct ad799x_state *st = iio_priv(indio_dev);
int ret; int ret;
mutex_lock(&indio_dev->mlock); ret = iio_device_claim_direct_mode(indio_dev);
if (iio_buffer_enabled(indio_dev)) { if (ret)
ret = -EBUSY; return ret;
goto done;
}
if (state) if (state)
st->config |= BIT(chan->scan_index) << AD799X_CHANNEL_SHIFT; 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; st->config &= ~AD7998_ALERT_EN;
ret = ad799x_write_config(st, st->config); ret = ad799x_write_config(st, st->config);
iio_device_release_direct_mode(indio_dev);
done:
mutex_unlock(&indio_dev->mlock);
return ret; return ret;
} }