redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

iio: proximity: lidar: switch to iio_device_claim_*_mode helpers 

Switch from using indio_dev->mlock to the iio_device_claim_*_mode
helper functions.

Signed-off-by: Matt Ranostay <mranostay@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
hifive-unleashed-5.1
Matt Ranostay 2016-06-07 21:18:04 -07:00 committed by Jonathan Cameron
parent bc2e1126ec
commit 9e18265443
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
View File

@ -203,22 +203,19 @@ static int lidar_read_raw(struct iio_dev *indio_dev,
struct lidar_data *data = iio_priv(indio_dev);
int ret = -EINVAL;
mutex_lock(&indio_dev->mlock);
if (iio_buffer_enabled(indio_dev) && mask == IIO_CHAN_INFO_RAW) {
ret = -EBUSY;
goto error_busy;
}
switch (mask) {
case IIO_CHAN_INFO_RAW: {
u16 reg;
if (iio_device_claim_direct_mode(indio_dev))
return -EBUSY;
ret = lidar_get_measurement(data, &reg);
if (!ret) {
*val = reg;
ret = IIO_VAL_INT;
}
iio_device_release_direct_mode(indio_dev);
break;
}
case IIO_CHAN_INFO_SCALE:
@ -228,9 +225,6 @@ static int lidar_read_raw(struct iio_dev *indio_dev,
break;
}
error_busy:
mutex_unlock(&indio_dev->mlock);
return ret;
}