From: Jonathan Cameron Date: Wed, 11 Dec 2013 18:45:00 +0000 (+0000) Subject: iio:dac:ad5686 replaces IIO_ST macro with explicit entries to struct scan_type X-Git-Tag: firefly_0821_release~176^2~4489^2~171^2~10 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=44ba1593acfe071e9d920157308dec1d2154ff2f;p=firefly-linux-kernel-4.4.55.git 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 Acked-by: Lars-Peter Clausen --- 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[] = { { }, }; -#define AD5868_CHANNEL(chan, bits, shift) { \ +#define AD5868_CHANNEL(chan, bits, _shift) { \ .type = IIO_VOLTAGE, \ .indexed = 1, \ .output = 1, \ @@ -275,7 +275,12 @@ static const struct iio_chan_spec_ext_info ad5686_ext_info[] = { .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),\ .address = AD5686_ADDR_DAC(chan), \ - .scan_type = IIO_ST('u', bits, 16, shift), \ + .scan_type = { \ + .sign = 'u', \ + .realbits = (bits), \ + .storagebits = 16, \ + .shift = (_shift), \ + }, \ .ext_info = ad5686_ext_info, \ }