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

[karo-tx-linux.git] / drivers / iio / adc / ad7476.c

diff --git a/drivers/iio/adc/ad7476.c b/drivers/iio/adc/ad7476.c
index 1491fa6debb2c5e2cc8be063fbf3409e7b5d0b40..2e98bef4af673fd6ebadcac12d7ef56fe0c0d226 100644 (file)
--- 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,
        return -EINVAL;
 }
 
-#define _AD7476_CHAN(bits, _shift, _info_mask)                 \
+#define _AD7476_CHAN(bits, _shift, _info_mask_sep)             \
        {                                                       \
        .type = IIO_VOLTAGE,                                    \
        .indexed = 1,                                           \
-       .info_mask = _info_mask |                               \
-       IIO_CHAN_INFO_SCALE_SHARED_BIT,                         \
+       .info_mask_separate = _info_mask_sep,                   \
+       .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),   \
        .scan_type = {                                          \
                .sign = 'u',                                    \
                .realbits = (bits),                             \
@@ -156,9 +156,9 @@ static int ad7476_read_raw(struct iio_dev *indio_dev,
 }
 
 #define AD7476_CHAN(bits) _AD7476_CHAN((bits), 13 - (bits), \
-               IIO_CHAN_INFO_RAW_SEPARATE_BIT)
+               BIT(IIO_CHAN_INFO_RAW))
 #define AD7940_CHAN(bits) _AD7476_CHAN((bits), 15 - (bits), \
-               IIO_CHAN_INFO_RAW_SEPARATE_BIT)
+               BIT(IIO_CHAN_INFO_RAW))
 #define AD7091R_CHAN(bits) _AD7476_CHAN((bits), 16 - (bits), 0)
 
 static const struct ad7476_chip_info ad7476_chip_info_tbl[] = {