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

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

diff --git a/drivers/staging/iio/accel/adis16203_core.c b/drivers/staging/iio/accel/adis16203_core.c
index 5bf944b9ae88416399c4f1b1c48078ff3d5eee32..bdc44feaa12375dd21cfdef9e6ec5b8a482e3890 100644 (file)
--- a/drivers/staging/iio/accel/adis16203_core.c
+++ b/drivers/staging/iio/accel/adis16203_core.c
@@ -329,8 +329,7 @@ static int adis16203_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_SHARED:
+       case IIO_CHAN_INFO_SCALE:
                switch (chan->type) {
                case IIO_VOLTAGE:
                        *val = 0;
@@ -350,10 +349,10 @@ static int adis16203_read_raw(struct iio_dev *indio_dev,
                default:
                        return -EINVAL;
                }
-       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_CALIBBIAS:
                bits = 14;
                mutex_lock(&indio_dev->mlock);
                addr = adis16203_addresses[chan->address][1];
@@ -374,26 +373,26 @@ static int adis16203_read_raw(struct iio_dev *indio_dev,
 
 static struct iio_chan_spec adis16203_channels[] = {
        IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "supply", 0, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 in_supply, ADIS16203_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, ADIS16203_SCAN_AUX_ADC,
                 IIO_ST('u', 12, 16, 0), 0),
        IIO_CHAN(IIO_INCLI, 1, 0, 0, NULL, 0, IIO_MOD_X,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
                 incli_x, ADIS16203_SCAN_INCLI_X,
                 IIO_ST('s', 14, 16, 0), 0),
        /* Fixme: Not what it appears to be - see data sheet */
        IIO_CHAN(IIO_INCLI, 1, 0, 0, NULL, 0, IIO_MOD_Y,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 incli_y, ADIS16203_SCAN_INCLI_Y,
                 IIO_ST('s', 14, 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, ADIS16203_SCAN_TEMP,
                 IIO_ST('u', 12, 16, 0), 0),
        IIO_CHAN_SOFT_TIMESTAMP(5),