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:06:57 -0500 |
commit | cb9d90f1e31703e8be427397c024f55a14ee6528 (patch) | |
tree | 5fb878886f123a811f637d574576cdbd27c3357b /drivers/iio | |
parent | 560101de9286d1a4932d08d97987c89901718a8b (diff) |
iio:dac:ad5791 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')
-rw-r--r-- | drivers/iio/dac/ad5791.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c index 79bf19945747..ae49afe2b380 100644 --- a/drivers/iio/dac/ad5791.c +++ b/drivers/iio/dac/ad5791.c | |||
@@ -293,7 +293,7 @@ static const struct iio_chan_spec_ext_info ad5791_ext_info[] = { | |||
293 | { }, | 293 | { }, |
294 | }; | 294 | }; |
295 | 295 | ||
296 | #define AD5791_CHAN(bits, shift) { \ | 296 | #define AD5791_CHAN(bits, _shift) { \ |
297 | .type = IIO_VOLTAGE, \ | 297 | .type = IIO_VOLTAGE, \ |
298 | .output = 1, \ | 298 | .output = 1, \ |
299 | .indexed = 1, \ | 299 | .indexed = 1, \ |
@@ -302,7 +302,12 @@ static const struct iio_chan_spec_ext_info ad5791_ext_info[] = { | |||
302 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ | 302 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ |
303 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \ | 303 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \ |
304 | BIT(IIO_CHAN_INFO_OFFSET), \ | 304 | BIT(IIO_CHAN_INFO_OFFSET), \ |
305 | .scan_type = IIO_ST('u', bits, 24, shift), \ | 305 | .scan_type = { \ |
306 | .sign = 'u', \ | ||
307 | .realbits = (bits), \ | ||
308 | .storagebits = 24, \ | ||
309 | .shift = (_shift), \ | ||
310 | }, \ | ||
306 | .ext_info = ad5791_ext_info, \ | 311 | .ext_info = ad5791_ext_info, \ |
307 | } | 312 | } |
308 | 313 | ||