staging:iio:accel:ad7780 unwind use of IIO_CHAN macro.

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

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/ad7780.c b/drivers/staging/iio/adc/ad7780.c
index a13e58c..4f0a6c9 100644 (file)
--- a/drivers/staging/iio/adc/ad7780.c
+++ b/drivers/staging/iio/adc/ad7780.c
@@ -126,14 +126,32 @@ static int ad7780_read_raw(struct iio_dev *indio_dev,
 
 static const struct ad7780_chip_info ad7780_chip_info_tbl[] = {
        [ID_AD7780] = {
-               .channel = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                   IIO_CHAN_INFO_SCALE_SHARED_BIT,
-                                   0, 0, IIO_ST('s', 24, 32, 8), 0),
+               .channel = {
+                       .type = IIO_VOLTAGE,
+                       .indexed = 1,
+                       .channel = 0,
+                       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
+                       .scan_type = {
+                               .sign = 's',
+                               .realbits = 24,
+                               .storagebits = 32,
+                               .shift = 8,
+                       },
+               },
        },
        [ID_AD7781] = {
-               .channel = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                   IIO_CHAN_INFO_SCALE_SHARED_BIT,
-                                   0, 0, IIO_ST('s', 20, 32, 12), 0),
+               .channel = {
+                       .type = IIO_VOLTAGE,
+                       .indexed = 1,
+                       .channel = 0,
+                       .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
+                       .scan_type = {
+                               .sign = 's',
+                               .realbits = 20,
+                               .storagebits = 32,
+                               .shift = 12,
+                       },
+               },
        },
 };