Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / iio / dac / ad5504.c

diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c
index e5e59749f109d1379b72aaa81950e987e7bb57ef..139206e84cb7bf32cd17d88d0b526174a32cfee5 100644 (file)
--- a/drivers/iio/dac/ad5504.c
+++ b/drivers/iio/dac/ad5504.c
@@ -259,8 +259,8 @@ static const struct iio_chan_spec_ext_info ad5504_ext_info[] = {
        .indexed = 1, \
        .output = 1, \
        .channel = (_chan), \
-       .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
-                    IIO_CHAN_INFO_SCALE_SHARED_BIT, \
+       .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
+       .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
        .address = AD5504_ADDR_DAC(_chan), \
        .scan_type = IIO_ST('u', 12, 16, 0), \
        .ext_info = ad5504_ext_info, \