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

[firefly-linux-kernel-4.4.55.git] / drivers / staging / iio / accel / adis16204_core.c

diff --git a/drivers/staging/iio/accel/adis16204_core.c b/drivers/staging/iio/accel/adis16204_core.c
index 068f543c938f9fd569c9c4d38a1ad38636642c69..96d8c7b3722ea16808cb5eab8c68e504c009ab6e 100644 (file)
--- a/drivers/staging/iio/accel/adis16204_core.c
+++ b/drivers/staging/iio/accel/adis16204_core.c
@@ -366,7 +366,7 @@ static int adis16204_read_raw(struct iio_dev *indio_dev,
                *val = val16;
                mutex_unlock(&indio_dev->mlock);
                return IIO_VAL_INT;
-       case IIO_CHAN_INFO_SCALE_SEPARATE:
+       case IIO_CHAN_INFO_SCALE:
                switch (chan->type) {
                case IIO_VOLTAGE:
                        *val = 0;
@@ -390,12 +390,12 @@ static int adis16204_read_raw(struct iio_dev *indio_dev,
                        return -EINVAL;
                }
                break;
-       case IIO_CHAN_INFO_OFFSET_SEPARATE:
+       case IIO_CHAN_INFO_OFFSET:
                *val = 25;
                return IIO_VAL_INT;
-       case IIO_CHAN_INFO_CALIBBIAS_SEPARATE:
-       case IIO_CHAN_INFO_PEAK_SEPARATE:
-               if (mask == IIO_CHAN_INFO_CALIBBIAS_SEPARATE) {
+       case IIO_CHAN_INFO_CALIBBIAS:
+       case IIO_CHAN_INFO_PEAK:
+               if (mask == IIO_CHAN_INFO_CALIBBIAS) {
                        bits = 12;
                        addrind = 1;
                } else { /* PEAK_SEPARATE */
@@ -428,7 +428,7 @@ static int adis16204_write_raw(struct iio_dev *indio_dev,
        s16 val16;
        u8 addr;
        switch (mask) {
-       case IIO_CHAN_INFO_CALIBBIAS_SEPARATE:
+       case IIO_CHAN_INFO_CALIBBIAS:
                switch (chan->type) {
                case IIO_ACCEL:
                        bits = 12;
@@ -445,28 +445,28 @@ static int adis16204_write_raw(struct iio_dev *indio_dev,
 
 static struct iio_chan_spec adis16204_channels[] = {
        IIO_CHAN(IIO_VOLTAGE, 0, 0, 0, "supply", 0, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 in_supply, ADIS16204_SCAN_SUPPLY,
                 IIO_ST('u', 12, 16, 0), 0),
        IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 in_aux, ADIS16204_SCAN_AUX_ADC,
                 IIO_ST('u', 12, 16, 0), 0),
        IIO_CHAN(IIO_TEMP, 0, 1, 0, NULL, 0, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_OFFSET_SEPARATE),
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,
                 temp, ADIS16204_SCAN_TEMP,
                 IIO_ST('u', 12, 16, 0), 0),
        IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_X,
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_PEAK_SEPARATE),
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
                 accel_x, ADIS16204_SCAN_ACC_X,
                 IIO_ST('s', 14, 16, 0), 0),
        IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_Y,
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_PEAK_SEPARATE),
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
                 accel_y, ADIS16204_SCAN_ACC_Y,
                 IIO_ST('s', 14, 16, 0), 0),
        IIO_CHAN_SOFT_TIMESTAMP(5),