staging:iio:adc:ad7476 unwind use of IIO_CHAN macro.

This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

V2 has the cleanup Lars-Peter suggested.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/iio/adc/ad7476_core.c b/drivers/staging/iio/adc/ad7476_core.c
index 0c064d1c3927d0c764f4b6b65afccfb7fb5e009b..694b5084136efb37e558c93285221d4a3a09b2b5 100644 (file)
--- a/drivers/staging/iio/adc/ad7476_core.c
+++ b/drivers/staging/iio/adc/ad7476_core.c
@@ -66,53 +66,50 @@ static int ad7476_read_raw(struct iio_dev *indio_dev,
        return -EINVAL;
 }
 
+#define AD7476_CHAN(bits)                                      \
+       {                                                       \
+       .type = IIO_VOLTAGE,                                    \
+       .indexed = 1,                                           \
+       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,            \
+       .scan_type = {                                          \
+               .sign = 'u',                                    \
+               .realbits = bits,                               \
+               .storagebits = 16,                              \
+               .shift = 12 - bits,                             \
+       },                                                      \
+}
+
 static const struct ad7476_chip_info ad7476_chip_info_tbl[] = {
        [ID_AD7466] = {
-               .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                      IIO_CHAN_INFO_SCALE_SHARED_BIT,
-                                      0, 0, IIO_ST('u', 12, 16, 0), 0),
+               .channel[0] = AD7476_CHAN(12),
                .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
        },
        [ID_AD7467] = {
-               .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                      IIO_CHAN_INFO_SCALE_SHARED_BIT,
-                                      0, 0, IIO_ST('u', 10, 16, 2), 0),
+               .channel[0] = AD7476_CHAN(10),
                .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
        },
        [ID_AD7468] = {
-               .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1 , 0, NULL, 0, 0,
-                                      IIO_CHAN_INFO_SCALE_SHARED_BIT,
-                                      0, 0, IIO_ST('u', 8, 16, 4), 0),
+               .channel[0] = AD7476_CHAN(8),
                .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
        },
        [ID_AD7475] = {
-               .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                      IIO_CHAN_INFO_SCALE_SHARED_BIT,
-                                      0, 0, IIO_ST('u', 12, 16, 0), 0),
+               .channel[0] = AD7476_CHAN(12),
                .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
        },
        [ID_AD7476] = {
-               .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                      IIO_CHAN_INFO_SCALE_SHARED_BIT,
-                                      0, 0, IIO_ST('u', 12, 16, 0), 0),
+               .channel[0] = AD7476_CHAN(12),
                .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
        },
        [ID_AD7477] = {
-               .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                      IIO_CHAN_INFO_SCALE_SHARED_BIT,
-                                      0, 0, IIO_ST('u', 10, 16, 2), 0),
+               .channel[0] = AD7476_CHAN(10),
                .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
        },
        [ID_AD7478] = {
-               .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                      IIO_CHAN_INFO_SCALE_SHARED_BIT,
-                                      0, 0, IIO_ST('u', 8, 16, 4), 0),
+               .channel[0] = AD7476_CHAN(8),
                .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
        },
        [ID_AD7495] = {
-               .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                      IIO_CHAN_INFO_SCALE_SHARED_BIT,
-                                      0, 0, IIO_ST('u', 12, 16, 0), 0),
+               .channel[0] = AD7476_CHAN(12),
                .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
                .int_vref_mv = 2500,
        },