staging:iio:adc:ad7280a move to info_mask_(shared_by_type/separate)
authorJonathan Cameron <jic23@kernel.org>
Wed, 27 Feb 2013 19:37:07 +0000 (19:37 +0000)
committerJonathan Cameron <jic23@kernel.org>
Sun, 17 Mar 2013 19:49:38 +0000 (19:49 +0000)
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>
drivers/staging/iio/adc/ad7280a.c

index 1f190c1..2fd6ee3 100644 (file)
@@ -503,9 +503,10 @@ static int ad7280_channel_init(struct ad7280_state *st)
                                st->channels[cnt].channel = (dev * 6) + ch - 6;
                        }
                        st->channels[cnt].indexed = 1;
-                       st->channels[cnt].info_mask =
-                               IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                               IIO_CHAN_INFO_SCALE_SHARED_BIT;
+                       st->channels[cnt].info_mask_separate =
+                               BIT(IIO_CHAN_INFO_RAW);
+                       st->channels[cnt].info_mask_shared_by_type =
+                               BIT(IIO_CHAN_INFO_SCALE);
                        st->channels[cnt].address =
                                AD7280A_DEVADDR(dev) << 8 | ch;
                        st->channels[cnt].scan_index = cnt;
@@ -521,9 +522,8 @@ static int ad7280_channel_init(struct ad7280_state *st)
        st->channels[cnt].channel2 = dev * 6;
        st->channels[cnt].address = AD7280A_ALL_CELLS;
        st->channels[cnt].indexed = 1;
-       st->channels[cnt].info_mask =
-               IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-               IIO_CHAN_INFO_SCALE_SHARED_BIT;
+       st->channels[cnt].info_mask_separate = BIT(IIO_CHAN_INFO_RAW);
+       st->channels[cnt].info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE);
        st->channels[cnt].scan_index = cnt;
        st->channels[cnt].scan_type.sign = 'u';
        st->channels[cnt].scan_type.realbits = 32;