diff options
author | Jonathan Cameron <jic23@kernel.org> | 2013-12-11 13:45:00 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-12-17 16:03:52 -0500 |
commit | 44ba1593acfe071e9d920157308dec1d2154ff2f (patch) | |
tree | 123966bf73f766b10dbd7c1ce62cabc7c6145c5b /drivers/iio/dac | |
parent | 4974600bbfc0f63810ba90538b18f094574cdf79 (diff) |
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>
Diffstat (limited to 'drivers/iio/dac')
-rw-r--r-- | drivers/iio/dac/ad5686.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c index e56ec0abb509..17aca4d9bd06 100644 --- 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[] = { | |||
267 | { }, | 267 | { }, |
268 | }; | 268 | }; |
269 | 269 | ||
270 | #define AD5868_CHANNEL(chan, bits, shift) { \ | 270 | #define AD5868_CHANNEL(chan, bits, _shift) { \ |
271 | .type = IIO_VOLTAGE, \ | 271 | .type = IIO_VOLTAGE, \ |
272 | .indexed = 1, \ | 272 | .indexed = 1, \ |
273 | .output = 1, \ | 273 | .output = 1, \ |
@@ -275,7 +275,12 @@ static const struct iio_chan_spec_ext_info ad5686_ext_info[] = { | |||
275 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ | 275 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ |
276 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),\ | 276 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),\ |
277 | .address = AD5686_ADDR_DAC(chan), \ | 277 | .address = AD5686_ADDR_DAC(chan), \ |
278 | .scan_type = IIO_ST('u', bits, 16, shift), \ | 278 | .scan_type = { \ |
279 | .sign = 'u', \ | ||
280 | .realbits = (bits), \ | ||
281 | .storagebits = 16, \ | ||
282 | .shift = (_shift), \ | ||
283 | }, \ | ||
279 | .ext_info = ad5686_ext_info, \ | 284 | .ext_info = ad5686_ext_info, \ |
280 | } | 285 | } |
281 | 286 | ||