diff options
| author | Jonathan Cameron <jic23@kernel.org> | 2013-02-27 14:30:18 -0500 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-03-17 15:49:35 -0400 |
| commit | 98bfb6e3727bd11089ca4c126248a4481bbe07c2 (patch) | |
| tree | 400c63db58c3113f002fcbcae6dd32d57e230bd4 /drivers/iio/gyro | |
| parent | 606f9067b573183035a0300c4595261ec9575c7d (diff) | |
iio:gyro:adxrs450 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>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Diffstat (limited to 'drivers/iio/gyro')
| -rw-r--r-- | drivers/iio/gyro/adxrs450.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/iio/gyro/adxrs450.c b/drivers/iio/gyro/adxrs450.c index 5b79953f7011..8bd72b490b7f 100644 --- a/drivers/iio/gyro/adxrs450.c +++ b/drivers/iio/gyro/adxrs450.c | |||
| @@ -383,16 +383,16 @@ static const struct iio_chan_spec adxrs450_channels[2][2] = { | |||
| 383 | .type = IIO_ANGL_VEL, | 383 | .type = IIO_ANGL_VEL, |
| 384 | .modified = 1, | 384 | .modified = 1, |
| 385 | .channel2 = IIO_MOD_Z, | 385 | .channel2 = IIO_MOD_Z, |
| 386 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | | 386 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | |
| 387 | IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | | 387 | BIT(IIO_CHAN_INFO_CALIBBIAS) | |
| 388 | IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE_BIT | | 388 | BIT(IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW) | |
| 389 | IIO_CHAN_INFO_SCALE_SEPARATE_BIT, | 389 | BIT(IIO_CHAN_INFO_SCALE), |
| 390 | }, { | 390 | }, { |
| 391 | .type = IIO_TEMP, | 391 | .type = IIO_TEMP, |
| 392 | .indexed = 1, | 392 | .indexed = 1, |
| 393 | .channel = 0, | 393 | .channel = 0, |
| 394 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | | 394 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | |
| 395 | IIO_CHAN_INFO_SCALE_SEPARATE_BIT, | 395 | BIT(IIO_CHAN_INFO_SCALE), |
| 396 | } | 396 | } |
| 397 | }, | 397 | }, |
| 398 | [ID_ADXRS453] = { | 398 | [ID_ADXRS453] = { |
| @@ -400,15 +400,15 @@ static const struct iio_chan_spec adxrs450_channels[2][2] = { | |||
| 400 | .type = IIO_ANGL_VEL, | 400 | .type = IIO_ANGL_VEL, |
| 401 | .modified = 1, | 401 | .modified = 1, |
| 402 | .channel2 = IIO_MOD_Z, | 402 | .channel2 = IIO_MOD_Z, |
| 403 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | | 403 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | |
| 404 | IIO_CHAN_INFO_SCALE_SEPARATE_BIT | | 404 | BIT(IIO_CHAN_INFO_SCALE) | |
| 405 | IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE_BIT, | 405 | BIT(IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW), |
| 406 | }, { | 406 | }, { |
| 407 | .type = IIO_TEMP, | 407 | .type = IIO_TEMP, |
| 408 | .indexed = 1, | 408 | .indexed = 1, |
| 409 | .channel = 0, | 409 | .channel = 0, |
| 410 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | | 410 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | |
| 411 | IIO_CHAN_INFO_SCALE_SEPARATE_BIT, | 411 | BIT(IIO_CHAN_INFO_SCALE), |
| 412 | } | 412 | } |
| 413 | }, | 413 | }, |
| 414 | }; | 414 | }; |