staging:iio:ade7758: Remove "raw" from channel name

commit b598aacc29331e7e638cd509108600e916c6331b upstream.

"raw" is a property of a channel, but should not be part of the name of
channel.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
[bwh: Backported to 3.2: using IIO_CHAN() macro to initialise the structures]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
index c5dafbd..5a46d91 100644 (file)
--- a/drivers/staging/iio/meter/ade7758_core.c
+++ b/drivers/staging/iio/meter/ade7758_core.c
@@ -662,63 +662,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,
+       IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                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,
+       IIO_CHAN(IIO_CURRENT, 0, 1, 0, NULL, 0, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                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,
+       IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent", 0, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                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,
+       IIO_CHAN(IIO_POWER, 0, 1, 0, "active", 0, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                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,
+       IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive", 0, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                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,
+       IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                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,
+       IIO_CHAN(IIO_CURRENT, 0, 1, 0, NULL, 1, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                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,
+       IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent", 1, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                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,
+       IIO_CHAN(IIO_POWER, 0, 1, 0, "active", 1, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                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,
+       IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive", 1, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                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,
+       IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 2, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                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,
+       IIO_CHAN(IIO_CURRENT, 0, 1, 0, NULL, 2, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                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,
+       IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent", 2, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                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,
+       IIO_CHAN(IIO_POWER, 0, 1, 0, "active", 2, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                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,
+       IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive", 2, 0,
                (1 << IIO_CHAN_INFO_SCALE_SHARED),
                AD7758_WT(AD7758_PHASE_C, AD7758_REACT_PWR),
                14, IIO_ST('s', 24, 32, 0), 0),