iio: adc: ad7887: use iio helper function to guarantee direct mode
authorAlison Schofield <amsfield22@gmail.com>
Tue, 24 May 2016 19:18:43 +0000 (12:18 -0700)
committerJonathan Cameron <jic23@kernel.org>
Sun, 29 May 2016 18:36:01 +0000 (19:36 +0100)
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>
drivers/iio/adc/ad7887.c

index 2d3c397e66ad4f8ca1785657e0e7159734680b65..ee2ccc19fab6d4baf0e3b8c44901966d728bc8b2 100644 (file)
@@ -156,12 +156,11 @@ static int ad7887_read_raw(struct iio_dev *indio_dev,
 
        switch (m) {
        case IIO_CHAN_INFO_RAW:
-               mutex_lock(&indio_dev->mlock);
-               if (iio_buffer_enabled(indio_dev))
-                       ret = -EBUSY;
-               else
-                       ret = ad7887_scan_direct(st, chan->address);
-               mutex_unlock(&indio_dev->mlock);
+               ret = iio_device_claim_direct_mode(indio_dev);
+               if (ret)
+                       return ret;
+               ret = ad7887_scan_direct(st, chan->address);
+               iio_device_release_direct_mode(indio_dev);
 
                if (ret < 0)
                        return ret;