aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@kernel.org>2013-02-27 14:04:29 -0500
committerJonathan Cameron <jic23@kernel.org>2013-03-17 15:49:28 -0400
commit40dd676d8f5254ababe31ea6bfe429458d98e8b6 (patch)
tree2020a2a6b26ce176bc0ed4876af347a7ef484334
parent3234ac7e6a96046bd2c996ed93cf843057c3e627 (diff)
iio:adc:ad7298 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>
-rw-r--r--drivers/iio/adc/ad7298.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/iio/adc/ad7298.c b/drivers/iio/adc/ad7298.c
index b34d754994d5..03b77189dbfe 100644
--- a/drivers/iio/adc/ad7298.c
+++ b/drivers/iio/adc/ad7298.c
@@ -63,8 +63,8 @@ struct ad7298_state {
63 .type = IIO_VOLTAGE, \ 63 .type = IIO_VOLTAGE, \
64 .indexed = 1, \ 64 .indexed = 1, \
65 .channel = index, \ 65 .channel = index, \
66 .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ 66 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
67 IIO_CHAN_INFO_SCALE_SHARED_BIT, \ 67 .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
68 .address = index, \ 68 .address = index, \
69 .scan_index = index, \ 69 .scan_index = index, \
70 .scan_type = { \ 70 .scan_type = { \
@@ -80,9 +80,9 @@ static const struct iio_chan_spec ad7298_channels[] = {
80 .type = IIO_TEMP, 80 .type = IIO_TEMP,
81 .indexed = 1, 81 .indexed = 1,
82 .channel = 0, 82 .channel = 0,
83 .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | 83 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
84 IIO_CHAN_INFO_SCALE_SEPARATE_BIT | 84 BIT(IIO_CHAN_INFO_SCALE) |
85 IIO_CHAN_INFO_OFFSET_SEPARATE_BIT, 85 BIT(IIO_CHAN_INFO_OFFSET),
86 .address = AD7298_CH_TEMP, 86 .address = AD7298_CH_TEMP,
87 .scan_index = -1, 87 .scan_index = -1,
88 .scan_type = { 88 .scan_type = {