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, 15 insertions, 15 deletions

diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
index 7028e87acb4..839b48b1b48 100644
--- a/drivers/staging/iio/meter/ade7758_core.c
+++ b/drivers/staging/iio/meter/ade7758_core.c
@@ -663,63 +663,63 @@ static const struct attribute_group ade7758_attribute_group = {
 
 static struct iio_chan_spec ade7758_channels[] = {
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "raw", 0, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_A, AD7758_VOLTAGE),
                 0, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_CURRENT, 0, 1, 0, "raw", 0, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_A, AD7758_CURRENT),
                 1, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent_raw", 0, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_A, AD7758_APP_PWR),
                 2, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "active_raw", 0, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_A, AD7758_ACT_PWR),
                 3, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive_raw", 0, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_A, AD7758_REACT_PWR),
                 4, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "raw", 1, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_B, AD7758_VOLTAGE),
                 5, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_CURRENT, 0, 1, 0, "raw", 1, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_B, AD7758_CURRENT),
                 6, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent_raw", 1, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_B, AD7758_APP_PWR),
                 7, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "active_raw", 1, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_B, AD7758_ACT_PWR),
                 8, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive_raw", 1, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_B, AD7758_REACT_PWR),
                 9, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "raw", 2, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_C, AD7758_VOLTAGE),
                 10, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_CURRENT, 0, 1, 0, "raw", 2, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_C, AD7758_CURRENT),
                 11, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent_raw", 2, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_C, AD7758_APP_PWR),
                 12, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "active_raw", 2, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_C, AD7758_ACT_PWR),
                 13, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive_raw", 2, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_C, AD7758_REACT_PWR),
                 14, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN_SOFT_TIMESTAMP(15),