commit 9e18265443d3a76462eafc3a0863c217aeaf62ac
author Matt Ranostay <mranostay@gmail.com> Tue Jun 07 21:18:04 2016 -0700
committer Jonathan Cameron <jic23@kernel.org> Sat Jun 11 17:08:20 2016 +0100
tree 460b7dab034a905f524d0e96d8b81c49f6aff258
parent bc2e1126eccb47517b9d1c685020c38600f99a3d

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>

drivers/iio/proximity/pulsedlight-lidar-lite-v2.c

diff --git a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
index 4f502386..c0b0e82 100644
--- a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
+++ b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
@@ -203,22 +203,19 @@
 	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 @@
 		break;
 	}
 
-error_busy:
-	mutex_unlock(&indio_dev->mlock);
-
 	return ret;
 }