staging:iio:accel:adis16220 move to info_mask_(shared_by_type/separate)

The original info_mask is going away in favour of the broken out versions.

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

diff --git a/drivers/staging/iio/accel/adis16220_core.c b/drivers/staging/iio/accel/adis16220_core.c
index 370b01a..0e72f79 100644 (file)
--- a/drivers/staging/iio/accel/adis16220_core.c
+++ b/drivers/staging/iio/accel/adis16220_core.c
@@ -344,37 +344,37 @@ static const struct iio_chan_spec adis16220_channels[] = {
                .indexed = 1,
                .channel = 0,
                .extend_name = "supply",
-               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                            IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+                       BIT(IIO_CHAN_INFO_SCALE),
                .address = in_supply,
        }, {
                .type = IIO_ACCEL,
-               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                            IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
-                            IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
-                            IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+                       BIT(IIO_CHAN_INFO_OFFSET) |
+                       BIT(IIO_CHAN_INFO_SCALE) |
+                       BIT(IIO_CHAN_INFO_PEAK),
                .address = accel,
        }, {
                .type = IIO_TEMP,
                .indexed = 1,
                .channel = 0,
-               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                            IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
-                            IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+                       BIT(IIO_CHAN_INFO_OFFSET) |
+                       BIT(IIO_CHAN_INFO_SCALE),
                .address = temp,
        }, {
                .type = IIO_VOLTAGE,
                .indexed = 1,
                .channel = 1,
-               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                            IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
-                            IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+                       BIT(IIO_CHAN_INFO_OFFSET) |
+                       BIT(IIO_CHAN_INFO_SCALE),
                .address = in_1,
        }, {
                .type = IIO_VOLTAGE,
                .indexed = 1,
                .channel = 2,
-               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
                .address = in_2,
        }
 };