diff options
| author | Jonathan Cameron <jic23@kernel.org> | 2013-02-27 14:29:24 -0500 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-03-17 15:49:34 -0400 |
| commit | 89352e9638109f91ab6fc4be3a98f0c8d9789826 (patch) | |
| tree | 81c9428d47e27892cbe6e01ee17f928ea3f13db8 /drivers/iio/gyro | |
| parent | beacbaac9909d1b68887c01017d52bd14574d050 (diff) | |
iio:gyro:adis16080 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/adis16080.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/iio/gyro/adis16080.c b/drivers/iio/gyro/adis16080.c index 1861287911f1..e1bb5f994a54 100644 --- a/drivers/iio/gyro/adis16080.c +++ b/drivers/iio/gyro/adis16080.c | |||
| @@ -136,32 +136,32 @@ static const struct iio_chan_spec adis16080_channels[] = { | |||
| 136 | .type = IIO_ANGL_VEL, | 136 | .type = IIO_ANGL_VEL, |
| 137 | .modified = 1, | 137 | .modified = 1, |
| 138 | .channel2 = IIO_MOD_Z, | 138 | .channel2 = IIO_MOD_Z, |
| 139 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | | 139 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | |
| 140 | IIO_CHAN_INFO_SCALE_SEPARATE_BIT, | 140 | BIT(IIO_CHAN_INFO_SCALE), |
| 141 | .address = ADIS16080_DIN_GYRO, | 141 | .address = ADIS16080_DIN_GYRO, |
| 142 | }, { | 142 | }, { |
| 143 | .type = IIO_VOLTAGE, | 143 | .type = IIO_VOLTAGE, |
| 144 | .indexed = 1, | 144 | .indexed = 1, |
| 145 | .channel = 0, | 145 | .channel = 0, |
| 146 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | | 146 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | |
| 147 | IIO_CHAN_INFO_SCALE_SEPARATE_BIT | | 147 | BIT(IIO_CHAN_INFO_SCALE) | |
| 148 | IIO_CHAN_INFO_OFFSET_SEPARATE_BIT, | 148 | BIT(IIO_CHAN_INFO_OFFSET), |
| 149 | .address = ADIS16080_DIN_AIN1, | 149 | .address = ADIS16080_DIN_AIN1, |
| 150 | }, { | 150 | }, { |
| 151 | .type = IIO_VOLTAGE, | 151 | .type = IIO_VOLTAGE, |
| 152 | .indexed = 1, | 152 | .indexed = 1, |
| 153 | .channel = 1, | 153 | .channel = 1, |
| 154 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | | 154 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | |
| 155 | IIO_CHAN_INFO_SCALE_SEPARATE_BIT | | 155 | BIT(IIO_CHAN_INFO_SCALE) | |
| 156 | IIO_CHAN_INFO_OFFSET_SEPARATE_BIT, | 156 | BIT(IIO_CHAN_INFO_OFFSET), |
| 157 | .address = ADIS16080_DIN_AIN2, | 157 | .address = ADIS16080_DIN_AIN2, |
| 158 | }, { | 158 | }, { |
| 159 | .type = IIO_TEMP, | 159 | .type = IIO_TEMP, |
| 160 | .indexed = 1, | 160 | .indexed = 1, |
| 161 | .channel = 0, | 161 | .channel = 0, |
| 162 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | | 162 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | |
| 163 | IIO_CHAN_INFO_SCALE_SEPARATE_BIT | | 163 | BIT(IIO_CHAN_INFO_SCALE) | |
| 164 | IIO_CHAN_INFO_OFFSET_SEPARATE_BIT, | 164 | BIT(IIO_CHAN_INFO_OFFSET), |
| 165 | .address = ADIS16080_DIN_TEMP, | 165 | .address = ADIS16080_DIN_TEMP, |
| 166 | } | 166 | } |
| 167 | }; | 167 | }; |