Merge tag 'iio-for-4.7a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...

[cascardo/linux.git] / drivers / staging / iio / adc / ad7192.c

diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index f843f19..1cf6b79 100644 (file)
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -35,10 +35,10 @@
 #define AD7192_REG_DATA                3 /* Data Register           (RO, 24/32-bit) */
 #define AD7192_REG_ID          4 /* ID Register             (RO, 8-bit) */
 #define AD7192_REG_GPOCON      5 /* GPOCON Register         (RO, 8-bit) */
-#define AD7192_REG_OFFSET      6 /* Offset Register         (RW, 16-bit
-                                  * (AD7792)/24-bit (AD7192)) */
-#define AD7192_REG_FULLSALE    7 /* Full-Scale Register
-                                  * (RW, 16-bit (AD7792)/24-bit (AD7192)) */
+#define AD7192_REG_OFFSET      6 /* Offset Register         (RW, 16-bit */
+                                 /* (AD7792)/24-bit (AD7192)) */
+#define AD7192_REG_FULLSALE    7 /* Full-Scale Register */
+                                 /* (RW, 16-bit (AD7792)/24-bit (AD7192)) */
 
 /* Communications Register Bit Designations (AD7192_REG_COMM) */
 #define AD7192_COMM_WEN                BIT(7) /* Write Enable */
@@ -80,13 +80,13 @@
 #define AD7192_MODE_CAL_SYS_FULL       7 /* System Full-Scale Calibration */
 
 /* Mode Register: AD7192_MODE_CLKSRC options */
-#define AD7192_CLK_EXT_MCLK1_2         0 /* External 4.92 MHz Clock connected
-                                          * from MCLK1 to MCLK2 */
+#define AD7192_CLK_EXT_MCLK1_2         0 /* External 4.92 MHz Clock connected*/
+                                         /* from MCLK1 to MCLK2 */
 #define AD7192_CLK_EXT_MCLK2           1 /* External Clock applied to MCLK2 */
-#define AD7192_CLK_INT                 2 /* Internal 4.92 MHz Clock not
-                                          * available at the MCLK2 pin */
-#define AD7192_CLK_INT_CO              3 /* Internal 4.92 MHz Clock available
-                                          * at the MCLK2 pin */
+#define AD7192_CLK_INT                 2 /* Internal 4.92 MHz Clock not */
+                                         /* available at the MCLK2 pin */
+#define AD7192_CLK_INT_CO              3 /* Internal 4.92 MHz Clock available*/
+                                         /* at the MCLK2 pin */
 
 /* Configuration Register Bit Designations (AD7192_REG_CONF) */
 
@@ -349,11 +349,9 @@ static ssize_t ad7192_write_frequency(struct device *dev,
        if (lval == 0)
                return -EINVAL;
 
-       mutex_lock(&indio_dev->mlock);
-       if (iio_buffer_enabled(indio_dev)) {
-               mutex_unlock(&indio_dev->mlock);
-               return -EBUSY;
-       }
+       ret = iio_device_claim_direct_mode(indio_dev);
+       if (ret)
+               return ret;
 
        div = st->mclk / (lval * st->f_order * 1024);
        if (div < 1 || div > 1023) {
@@ -366,7 +364,7 @@ static ssize_t ad7192_write_frequency(struct device *dev,
        ad_sd_write_reg(&st->sd, AD7192_REG_MODE, 3, st->mode);
 
 out:
-       mutex_unlock(&indio_dev->mlock);
+       iio_device_release_direct_mode(indio_dev);
 
        return ret ? ret : len;
 }
@@ -434,11 +432,9 @@ static ssize_t ad7192_set(struct device *dev,
        if (ret < 0)
                return ret;
 
-       mutex_lock(&indio_dev->mlock);
-       if (iio_buffer_enabled(indio_dev)) {
-               mutex_unlock(&indio_dev->mlock);
-               return -EBUSY;
-       }
+       ret = iio_device_claim_direct_mode(indio_dev);
+       if (ret)
+               return ret;
 
        switch ((u32)this_attr->address) {
        case AD7192_REG_GPOCON:
@@ -461,7 +457,7 @@ static ssize_t ad7192_set(struct device *dev,
                ret = -EINVAL;
        }
 
-       mutex_unlock(&indio_dev->mlock);
+       iio_device_release_direct_mode(indio_dev);
 
        return ret ? ret : len;
 }
@@ -555,11 +551,9 @@ static int ad7192_write_raw(struct iio_dev *indio_dev,
        int ret, i;
        unsigned int tmp;
 
-       mutex_lock(&indio_dev->mlock);
-       if (iio_buffer_enabled(indio_dev)) {
-               mutex_unlock(&indio_dev->mlock);
-               return -EBUSY;
-       }
+       ret = iio_device_claim_direct_mode(indio_dev);
+       if (ret)
+               return ret;
 
        switch (mask) {
        case IIO_CHAN_INFO_SCALE:
@@ -582,7 +576,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev,
                ret = -EINVAL;
        }
 
-       mutex_unlock(&indio_dev->mlock);
+       iio_device_release_direct_mode(indio_dev);
 
        return ret;
 }