diff options
author | Jonathan Cameron <jic23@kernel.org> | 2013-02-27 14:32:17 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-03-17 15:49:36 -0400 |
commit | 0b1f8da3ac885f16209b238239cd6158c4fa273e (patch) | |
tree | af4c9aeac99c2eff85905cbe7f692fa608de1d57 | |
parent | 86b64c9da23e8bd08e303094db12042b293a9ca5 (diff) |
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>
-rw-r--r-- | drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c index 37ca05b47e4b..fe4c61e219f3 100644 --- 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, | |||
544 | .type = _type, \ | 544 | .type = _type, \ |
545 | .modified = 1, \ | 545 | .modified = 1, \ |
546 | .channel2 = _channel2, \ | 546 | .channel2 = _channel2, \ |
547 | .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT \ | 547 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ |
548 | | IIO_CHAN_INFO_RAW_SEPARATE_BIT, \ | 548 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ |
549 | .scan_index = _index, \ | 549 | .scan_index = _index, \ |
550 | .scan_type = { \ | 550 | .scan_type = { \ |
551 | .sign = 's', \ | 551 | .sign = 's', \ |
@@ -564,9 +564,9 @@ static const struct iio_chan_spec inv_mpu_channels[] = { | |||
564 | */ | 564 | */ |
565 | { | 565 | { |
566 | .type = IIO_TEMP, | 566 | .type = IIO_TEMP, |
567 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | 567 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
568 | | IIO_CHAN_INFO_OFFSET_SEPARATE_BIT | 568 | | BIT(IIO_CHAN_INFO_OFFSET) |
569 | | IIO_CHAN_INFO_SCALE_SEPARATE_BIT, | 569 | | BIT(IIO_CHAN_INFO_SCALE), |
570 | .scan_index = -1, | 570 | .scan_index = -1, |
571 | }, | 571 | }, |
572 | INV_MPU6050_CHAN(IIO_ANGL_VEL, IIO_MOD_X, INV_MPU6050_SCAN_GYRO_X), | 572 | INV_MPU6050_CHAN(IIO_ANGL_VEL, IIO_MOD_X, INV_MPU6050_SCAN_GYRO_X), |