iio:dac:ad5686 replaces IIO_ST macro with explicit entries to struct scan_type

IIO_ST is going away as it is a pain to maintain.

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

diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c
index e56ec0abb509d3036224ed3293c10d929a5f8b01..17aca4d9bd06e5a6f52d51ecc867bb54890ab62f 100644 (file)
--- a/drivers/iio/dac/ad5686.c
+++ b/drivers/iio/dac/ad5686.c
@@ -267,7 +267,7 @@ static const struct iio_chan_spec_ext_info ad5686_ext_info[] = {
        { },
 };
 
-#define AD5868_CHANNEL(chan, bits, shift) {                    \
+#define AD5868_CHANNEL(chan, bits, _shift) {                   \
                .type = IIO_VOLTAGE,                            \
                .indexed = 1,                                   \
                .output = 1,                                    \
@@ -275,7 +275,12 @@ static const struct iio_chan_spec_ext_info ad5686_ext_info[] = {
                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),   \
                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),\
                .address = AD5686_ADDR_DAC(chan),               \
-               .scan_type = IIO_ST('u', bits, 16, shift),      \
+               .scan_type = {                                  \
+                       .sign = 'u',                            \
+                       .realbits = (bits),                     \
+                       .storagebits = 16,                      \
+                       .shift = (_shift),                      \
+               },                                              \
                .ext_info = ad5686_ext_info,                    \
 }