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

Internally the fact that say scale is shared across channels is
actually of remarkably little interest.  Hence lets not store it.
Numerous devices have weird combinations of channels sharing
scale anyway so it is not as though this was really telling
us much. Note however that we do still use the shared sysfs
attrs thus massively reducing the number of attrs in complex
drivers.

Side effect is that certain drivers that were abusing this
(mostly my work) needed to do a few more checks on what the
channel they are being queried on actually is.

This is also helpful for in kernel interfaces where we
just want to query the scale and don't care whether it
is shared with other channels or not.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 13 insertions, 14 deletions

diff --git a/drivers/staging/iio/gyro/adis16260_core.c b/drivers/staging/iio/gyro/adis16260_core.c
index 4f5a7cb3f7e..e86ce6a1611 100644
--- a/drivers/staging/iio/gyro/adis16260_core.c
+++ b/drivers/staging/iio/gyro/adis16260_core.c
@@ -390,9 +390,9 @@ enum adis16260_channel {
 #define ADIS16260_GYRO_CHANNEL_SET(axis, mod)                           \
         struct iio_chan_spec adis16260_channels_##axis[] = {            \
                 IIO_CHAN(IIO_ANGL_VEL, 1, 0, 0, NULL, 0, mod,           \
-                         (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |      \
-                         (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |     \
-                         (1 << IIO_CHAN_INFO_SCALE_SEPARATE),           \
+                         IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | \
+                         IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |        \
+                         IIO_CHAN_INFO_SCALE_SEPARATE_BIT,              \
                          gyro, ADIS16260_SCAN_GYRO,                     \
                          IIO_ST('s', 14, 16, 0), 0),                    \
                 IIO_CHAN(IIO_ANGL, 1, 0, 0, NULL, 0, mod,               \
@@ -400,16 +400,16 @@ enum adis16260_channel {
                          angle, ADIS16260_SCAN_ANGL,                    \
                          IIO_ST('u', 14, 16, 0), 0),                    \
                 IIO_CHAN(IIO_TEMP, 0, 1, 0, NULL, 0, 0,                 \
-                         (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |         \
-                         (1 << IIO_CHAN_INFO_SCALE_SEPARATE),           \
+                         IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |            \
+                         IIO_CHAN_INFO_SCALE_SEPARATE_BIT,              \
                          temp, ADIS16260_SCAN_TEMP,                     \
                          IIO_ST('u', 12, 16, 0), 0),                    \
                 IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "supply", 0, 0,          \
-                         (1 << IIO_CHAN_INFO_SCALE_SEPARATE),           \
+                         IIO_CHAN_INFO_SCALE_SEPARATE_BIT,              \
                          in_supply, ADIS16260_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, ADIS16260_SCAN_AUX_ADC,                \
                          IIO_ST('u', 12, 16, 0), 0),                    \
                 IIO_CHAN_SOFT_TIMESTAMP(5)                              \
@@ -464,8 +464,7 @@ static int adis16260_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_ANGL_VEL:
                         *val = 0;
@@ -489,10 +488,10 @@ static int adis16260_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_CALIBBIAS:
                 switch (chan->type) {
                 case IIO_ANGL_VEL:
                         bits = 12;
@@ -512,7 +511,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev,
                 *val = val16;
                 mutex_unlock(&indio_dev->mlock);
                 return IIO_VAL_INT;
-        case IIO_CHAN_INFO_CALIBSCALE_SEPARATE:
+        case IIO_CHAN_INFO_CALIBSCALE:
                 switch (chan->type) {
                 case IIO_ANGL_VEL:
                         bits = 12;
@@ -544,11 +543,11 @@ static int adis16260_write_raw(struct iio_dev *indio_dev,
         s16 val16;
         u8 addr;
         switch (mask) {
-        case IIO_CHAN_INFO_CALIBBIAS_SEPARATE:
+        case IIO_CHAN_INFO_CALIBBIAS:
                 val16 = val & ((1 << bits) - 1);
                 addr = adis16260_addresses[chan->address][1];
                 return adis16260_spi_write_reg_16(indio_dev, addr, val16);
-        case IIO_CHAN_INFO_CALIBSCALE_SEPARATE:
+        case IIO_CHAN_INFO_CALIBSCALE:
                 val16 = val & ((1 << bits) - 1);
                 addr = adis16260_addresses[chan->address][2];
                 return adis16260_spi_write_reg_16(indio_dev, addr, val16);