diff options
| author | Jonathan Cameron <jic23@kernel.org> | 2013-02-27 14:03:04 -0500 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-03-17 15:49:18 -0400 |
| commit | ecbe18f2c3428aa1412e1174196506e3655a7e82 (patch) | |
| tree | c13ab53ca88e44920aecc580084cde04ad2871c7 /drivers/iio/magnetometer | |
| parent | fa357a6a48420ff6dac6425b235830036ff3dc47 (diff) | |
iio:hid_sensors 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>
Diffstat (limited to 'drivers/iio/magnetometer')
| -rw-r--r-- | drivers/iio/magnetometer/hid-sensor-magn-3d.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c index d8d01265220b..99f4e494513b 100644 --- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c +++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c | |||
| @@ -60,28 +60,28 @@ static const struct iio_chan_spec magn_3d_channels[] = { | |||
| 60 | .type = IIO_MAGN, | 60 | .type = IIO_MAGN, |
| 61 | .modified = 1, | 61 | .modified = 1, |
| 62 | .channel2 = IIO_MOD_X, | 62 | .channel2 = IIO_MOD_X, |
| 63 | .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT | | 63 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) | |
| 64 | IIO_CHAN_INFO_SCALE_SHARED_BIT | | 64 | BIT(IIO_CHAN_INFO_SCALE) | |
| 65 | IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT | | 65 | BIT(IIO_CHAN_INFO_SAMP_FREQ) | |
| 66 | IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT, | 66 | BIT(IIO_CHAN_INFO_HYSTERESIS), |
| 67 | .scan_index = CHANNEL_SCAN_INDEX_X, | 67 | .scan_index = CHANNEL_SCAN_INDEX_X, |
| 68 | }, { | 68 | }, { |
| 69 | .type = IIO_MAGN, | 69 | .type = IIO_MAGN, |
| 70 | .modified = 1, | 70 | .modified = 1, |
| 71 | .channel2 = IIO_MOD_Y, | 71 | .channel2 = IIO_MOD_Y, |
| 72 | .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT | | 72 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) | |
| 73 | IIO_CHAN_INFO_SCALE_SHARED_BIT | | 73 | BIT(IIO_CHAN_INFO_SCALE) | |
| 74 | IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT | | 74 | BIT(IIO_CHAN_INFO_SAMP_FREQ) | |
| 75 | IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT, | 75 | BIT(IIO_CHAN_INFO_HYSTERESIS), |
| 76 | .scan_index = CHANNEL_SCAN_INDEX_Y, | 76 | .scan_index = CHANNEL_SCAN_INDEX_Y, |
| 77 | }, { | 77 | }, { |
| 78 | .type = IIO_MAGN, | 78 | .type = IIO_MAGN, |
| 79 | .modified = 1, | 79 | .modified = 1, |
| 80 | .channel2 = IIO_MOD_Z, | 80 | .channel2 = IIO_MOD_Z, |
| 81 | .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT | | 81 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) | |
| 82 | IIO_CHAN_INFO_SCALE_SHARED_BIT | | 82 | BIT(IIO_CHAN_INFO_SCALE) | |
| 83 | IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT | | 83 | BIT(IIO_CHAN_INFO_SAMP_FREQ) | |
| 84 | IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT, | 84 | BIT(IIO_CHAN_INFO_HYSTERESIS), |
| 85 | .scan_index = CHANNEL_SCAN_INDEX_Z, | 85 | .scan_index = CHANNEL_SCAN_INDEX_Z, |
| 86 | } | 86 | } |
| 87 | }; | 87 | }; |