1 files changed, 25 insertions, 25 deletions

diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c
index 5deaf857d23..de8f844dc9f 100644
--- a/drivers/staging/iio/cdc/ad7746.c
+++ b/drivers/staging/iio/cdc/ad7746.c
@@ -123,7 +123,7 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .type = IIO_VOLTAGE,
                 .indexed = 1,
                 .channel = 0,
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = AD7746_REG_VT_DATA_HIGH << 8 |
                         AD7746_VTSETUP_VTMD_EXT_VIN,
         },
@@ -132,7 +132,7 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .indexed = 1,
                 .channel = 1,
                 .extend_name = "supply",
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = AD7746_REG_VT_DATA_HIGH << 8 |
                         AD7746_VTSETUP_VTMD_VDD_MON,
         },
@@ -156,10 +156,10 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .type = IIO_CAPACITANCE,
                 .indexed = 1,
                 .channel = 0,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SHARED) |
-                (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SHARED_BIT |
+                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = AD7746_REG_CAP_DATA_HIGH << 8,
         },
         [CIN1_DIFF] = {
@@ -168,10 +168,10 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .indexed = 1,
                 .channel = 0,
                 .channel2 = 2,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SHARED) |
-                (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SHARED_BIT |
+                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = AD7746_REG_CAP_DATA_HIGH << 8 |
                         AD7746_CAPSETUP_CAPDIFF
         },
@@ -179,10 +179,10 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .type = IIO_CAPACITANCE,
                 .indexed = 1,
                 .channel = 1,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SHARED) |
-                (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SHARED_BIT |
+                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = AD7746_REG_CAP_DATA_HIGH << 8 |
                         AD7746_CAPSETUP_CIN2,
         },
@@ -192,10 +192,10 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .indexed = 1,
                 .channel = 1,
                 .channel2 = 3,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SHARED) |
-                (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SHARED_BIT |
+                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = AD7746_REG_CAP_DATA_HIGH << 8 |
                         AD7746_CAPSETUP_CAPDIFF | AD7746_CAPSETUP_CIN2,
         }
@@ -477,7 +477,7 @@ static int ad7746_write_raw(struct iio_dev *indio_dev,
         mutex_lock(&indio_dev->mlock);
 
         switch (mask) {
-        case IIO_CHAN_INFO_CALIBSCALE_SEPARATE:
+        case IIO_CHAN_INFO_CALIBSCALE:
                 if (val != 1) {
                         ret = -EINVAL;
                         goto out;
@@ -503,7 +503,7 @@ static int ad7746_write_raw(struct iio_dev *indio_dev,
 
                 ret = 0;
                 break;
-        case IIO_CHAN_INFO_CALIBBIAS_SHARED:
+        case IIO_CHAN_INFO_CALIBBIAS:
                 if ((val < 0) | (val > 0xFFFF)) {
                         ret = -EINVAL;
                         goto out;
@@ -515,7 +515,7 @@ static int ad7746_write_raw(struct iio_dev *indio_dev,
 
                 ret = 0;
                 break;
-        case IIO_CHAN_INFO_OFFSET_SEPARATE:
+        case IIO_CHAN_INFO_OFFSET:
                 if ((val < 0) | (val > 43008000)) { /* 21pF */
                         ret = -EINVAL;
                         goto out;
@@ -612,7 +612,7 @@ static int ad7746_read_raw(struct iio_dev *indio_dev,
 
                 ret = IIO_VAL_INT;
                 break;
-        case IIO_CHAN_INFO_CALIBSCALE_SEPARATE:
+        case IIO_CHAN_INFO_CALIBSCALE:
                 switch (chan->type) {
                 case IIO_CAPACITANCE:
                         reg = AD7746_REG_CAP_GAINH;
@@ -634,7 +634,7 @@ static int ad7746_read_raw(struct iio_dev *indio_dev,
 
                 ret = IIO_VAL_INT_PLUS_MICRO;
                 break;
-        case IIO_CHAN_INFO_CALIBBIAS_SHARED:
+        case IIO_CHAN_INFO_CALIBBIAS:
                 ret = i2c_smbus_read_word_data(chip->client,
                                                AD7746_REG_CAP_OFFH);
                 if (ret < 0)
@@ -643,13 +643,13 @@ static int ad7746_read_raw(struct iio_dev *indio_dev,
 
                 ret = IIO_VAL_INT;
                 break;
-        case IIO_CHAN_INFO_OFFSET_SEPARATE:
+        case IIO_CHAN_INFO_OFFSET:
                 *val = AD7746_CAPDAC_DACP(chip->capdac[chan->channel]
                         [chan->differential]) * 338646;
 
                 ret = IIO_VAL_INT;
                 break;
-        case IIO_CHAN_INFO_SCALE_SHARED:
+        case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_CAPACITANCE:
                         /* 8.192pf / 2^24 */