staging:iio:treewide only use shared to decide on interfaces

[firefly-linux-kernel-4.4.55.git] / drivers / staging / iio / cdc / ad7152.c

diff --git a/drivers/staging/iio/cdc/ad7152.c b/drivers/staging/iio/cdc/ad7152.c
index e5ca683a7af07ef9fdfa7b7f523fcb4f21e2610a..29b2dc6e4f85f8a385f88c23fd557b924fc1ea9c 100644 (file)
--- a/drivers/staging/iio/cdc/ad7152.c
+++ b/drivers/staging/iio/cdc/ad7152.c
@@ -259,7 +259,7 @@ static int ad7152_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;
@@ -276,7 +276,7 @@ static int ad7152_write_raw(struct iio_dev *indio_dev,
                ret = 0;
                break;
 
-       case IIO_CHAN_INFO_CALIBBIAS_SEPARATE:
+       case IIO_CHAN_INFO_CALIBBIAS:
                if ((val < 0) | (val > 0xFFFF)) {
                        ret = -EINVAL;
                        goto out;
@@ -289,7 +289,7 @@ static int ad7152_write_raw(struct iio_dev *indio_dev,
 
                ret = 0;
                break;
-       case IIO_CHAN_INFO_SCALE_SEPARATE:
+       case IIO_CHAN_INFO_SCALE:
                if (val != 0) {
                        ret = -EINVAL;
                        goto out;
@@ -372,7 +372,7 @@ static int ad7152_read_raw(struct iio_dev *indio_dev,
 
                ret = IIO_VAL_INT;
                break;
-       case IIO_CHAN_INFO_CALIBSCALE_SEPARATE:
+       case IIO_CHAN_INFO_CALIBSCALE:
 
                ret = i2c_smbus_read_word_data(chip->client,
                                ad7152_addresses[chan->channel][AD7152_GAIN]);
@@ -384,7 +384,7 @@ static int ad7152_read_raw(struct iio_dev *indio_dev,
 
                ret = IIO_VAL_INT_PLUS_MICRO;
                break;
-       case IIO_CHAN_INFO_CALIBBIAS_SEPARATE:
+       case IIO_CHAN_INFO_CALIBBIAS:
                ret = i2c_smbus_read_word_data(chip->client,
                                ad7152_addresses[chan->channel][AD7152_OFFS]);
                if (ret < 0)
@@ -393,7 +393,7 @@ static int ad7152_read_raw(struct iio_dev *indio_dev,
 
                ret = IIO_VAL_INT;
                break;
-       case IIO_CHAN_INFO_SCALE_SEPARATE:
+       case IIO_CHAN_INFO_SCALE:
                ret = i2c_smbus_read_byte_data(chip->client,
                                ad7152_addresses[chan->channel][AD7152_SETUP]);
                if (ret < 0)
@@ -416,7 +416,7 @@ static int ad7152_write_raw_get_fmt(struct iio_dev *indio_dev,
                               long mask)
 {
        switch (mask) {
-       case IIO_CHAN_INFO_SCALE_SEPARATE:
+       case IIO_CHAN_INFO_SCALE:
                return IIO_VAL_INT_PLUS_NANO;
        default:
                return IIO_VAL_INT_PLUS_MICRO;
@@ -436,34 +436,34 @@ static const struct iio_chan_spec ad7152_channels[] = {
                .type = IIO_CAPACITANCE,
                .indexed = 1,
                .channel = 0,
-               .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-               (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-               (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+               .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+               IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+               IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
        }, {
                .type = IIO_CAPACITANCE,
                .differential = 1,
                .indexed = 1,
                .channel = 0,
                .channel2 = 2,
-               .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-               (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-               (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+               .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+               IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+               IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
        }, {
                .type = IIO_CAPACITANCE,
                .indexed = 1,
                .channel = 1,
-               .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-               (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-               (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+               .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+               IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+               IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
        }, {
                .type = IIO_CAPACITANCE,
                .differential = 1,
                .indexed = 1,
                .channel = 1,
                .channel2 = 3,
-               .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-               (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-               (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+               .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+               IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+               IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
        }
 };
 /*