diff options
author | Jonathan Cameron <jic23@kernel.org> | 2013-02-27 14:05:34 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-03-17 15:49:29 -0400 |
commit | 8c1033f733d85a3d5da82dea34ef6d989dd297f5 (patch) | |
tree | f17d169c17c1e9093748e78fa13d6ee6f830d380 /drivers/iio/adc | |
parent | 40dd676d8f5254ababe31ea6bfe429458d98e8b6 (diff) |
iio:adc:ad7476 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>
Diffstat (limited to 'drivers/iio/adc')
-rw-r--r-- | drivers/iio/adc/ad7476.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/iio/adc/ad7476.c b/drivers/iio/adc/ad7476.c index 1491fa6debb2..2e98bef4af67 100644 --- a/drivers/iio/adc/ad7476.c +++ b/drivers/iio/adc/ad7476.c | |||
@@ -140,12 +140,12 @@ static int ad7476_read_raw(struct iio_dev *indio_dev, | |||
140 | return -EINVAL; | 140 | return -EINVAL; |
141 | } | 141 | } |
142 | 142 | ||
143 | #define _AD7476_CHAN(bits, _shift, _info_mask) \ | 143 | #define _AD7476_CHAN(bits, _shift, _info_mask_sep) \ |
144 | { \ | 144 | { \ |
145 | .type = IIO_VOLTAGE, \ | 145 | .type = IIO_VOLTAGE, \ |
146 | .indexed = 1, \ | 146 | .indexed = 1, \ |
147 | .info_mask = _info_mask | \ | 147 | .info_mask_separate = _info_mask_sep, \ |
148 | IIO_CHAN_INFO_SCALE_SHARED_BIT, \ | 148 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ |
149 | .scan_type = { \ | 149 | .scan_type = { \ |
150 | .sign = 'u', \ | 150 | .sign = 'u', \ |
151 | .realbits = (bits), \ | 151 | .realbits = (bits), \ |
@@ -156,9 +156,9 @@ static int ad7476_read_raw(struct iio_dev *indio_dev, | |||
156 | } | 156 | } |
157 | 157 | ||
158 | #define AD7476_CHAN(bits) _AD7476_CHAN((bits), 13 - (bits), \ | 158 | #define AD7476_CHAN(bits) _AD7476_CHAN((bits), 13 - (bits), \ |
159 | IIO_CHAN_INFO_RAW_SEPARATE_BIT) | 159 | BIT(IIO_CHAN_INFO_RAW)) |
160 | #define AD7940_CHAN(bits) _AD7476_CHAN((bits), 15 - (bits), \ | 160 | #define AD7940_CHAN(bits) _AD7476_CHAN((bits), 15 - (bits), \ |
161 | IIO_CHAN_INFO_RAW_SEPARATE_BIT) | 161 | BIT(IIO_CHAN_INFO_RAW)) |
162 | #define AD7091R_CHAN(bits) _AD7476_CHAN((bits), 16 - (bits), 0) | 162 | #define AD7091R_CHAN(bits) _AD7476_CHAN((bits), 16 - (bits), 0) |
163 | 163 | ||
164 | static const struct ad7476_chip_info ad7476_chip_info_tbl[] = { | 164 | static const struct ad7476_chip_info ad7476_chip_info_tbl[] = { |