diff options
| author | Jonathan Cameron <jic23@kernel.org> | 2013-02-27 19:41:59 +0000 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-03-17 19:49:23 +0000 |
| commit | 5ea864940e8ab63c2669902650b807d0507c390d (patch) | |
| tree | b13cfa07daaaab6523079a8d3374865b852880e7 /include/linux/iio | |
| parent | 2f6bb53480b5cf02e39cd1ab0d1f3b97584550a2 (diff) | |
| download | blackbird-op-linux-5ea864940e8ab63c2669902650b807d0507c390d.tar.gz blackbird-op-linux-5ea864940e8ab63c2669902650b807d0507c390d.zip | |
iio:st_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>
Acked-by: Denis Ciocca <denis.ciocca@st.com>
Diffstat (limited to 'include/linux/iio')
| -rw-r--r-- | include/linux/iio/common/st_sensors.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h index 1f86a97ab2e2..7c0c0d3aef35 100644 --- a/include/linux/iio/common/st_sensors.h +++ b/include/linux/iio/common/st_sensors.h @@ -15,6 +15,7 @@ #include <linux/spi/spi.h> #include <linux/irqreturn.h> #include <linux/iio/trigger.h> +#include <linux/bitops.h> #define ST_SENSORS_TX_MAX_LENGTH 2 #define ST_SENSORS_RX_MAX_LENGTH 6 @@ -45,8 +46,8 @@ { \ .type = device_type, \ .modified = 1, \ - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ - IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE), \ .scan_index = index, \ .channel2 = mod, \ .address = addr, \ |
