Commit 9e182654 authored by Matt Ranostay's avatar Matt Ranostay Committed by Jonathan Cameron

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: default avatarMatt Ranostay <mranostay@gmail.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent bc2e1126
...@@ -203,22 +203,19 @@ static int lidar_read_raw(struct iio_dev *indio_dev, ...@@ -203,22 +203,19 @@ static int lidar_read_raw(struct iio_dev *indio_dev,
struct lidar_data *data = iio_priv(indio_dev); struct lidar_data *data = iio_priv(indio_dev);
int ret = -EINVAL; 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) { switch (mask) {
case IIO_CHAN_INFO_RAW: { case IIO_CHAN_INFO_RAW: {
u16 reg; u16 reg;
if (iio_device_claim_direct_mode(indio_dev))
return -EBUSY;
ret = lidar_get_measurement(data, &reg); ret = lidar_get_measurement(data, &reg);
if (!ret) { if (!ret) {
*val = reg; *val = reg;
ret = IIO_VAL_INT; ret = IIO_VAL_INT;
} }
iio_device_release_direct_mode(indio_dev);
break; break;
} }
case IIO_CHAN_INFO_SCALE: case IIO_CHAN_INFO_SCALE:
...@@ -228,9 +225,6 @@ static int lidar_read_raw(struct iio_dev *indio_dev, ...@@ -228,9 +225,6 @@ static int lidar_read_raw(struct iio_dev *indio_dev,
break; break;
} }
error_busy:
mutex_unlock(&indio_dev->mlock);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment