iio:imu:mpu6050 move to info_mask_(shared_by_type/separate)

The original info_mask is going away in favour of the broken out versions.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
cc: Ge Gao <ggao@invensense.com>

diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index 37ca05b47e4b70599500bb1b59774fecd3cc2722..fe4c61e219f38781d194028be6bad811287b36e6 100644 (file)
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -544,8 +544,8 @@ static int inv_mpu6050_validate_trigger(struct iio_dev *indio_dev,
                .type = _type,                                        \
                .modified = 1,                                        \
                .channel2 = _channel2,                                \
-               .info_mask =  IIO_CHAN_INFO_SCALE_SHARED_BIT          \
-                               | IIO_CHAN_INFO_RAW_SEPARATE_BIT,     \
+               .info_mask_shared_by_type =  BIT(IIO_CHAN_INFO_SCALE), \
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),         \
                .scan_index = _index,                                 \
                .scan_type = {                                        \
                                .sign = 's',                          \
@@ -564,9 +564,9 @@ static const struct iio_chan_spec inv_mpu_channels[] = {
         */
        {
                .type = IIO_TEMP,
-               .info_mask =  IIO_CHAN_INFO_RAW_SEPARATE_BIT
-                               | IIO_CHAN_INFO_OFFSET_SEPARATE_BIT
-                               | IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
+               .info_mask_separate =  BIT(IIO_CHAN_INFO_RAW)
+                               | BIT(IIO_CHAN_INFO_OFFSET)
+                               | BIT(IIO_CHAN_INFO_SCALE),
                .scan_index = -1,
        },
        INV_MPU6050_CHAN(IIO_ANGL_VEL, IIO_MOD_X, INV_MPU6050_SCAN_GYRO_X),