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>

diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index 1f86a97..7c0c0d3 100644 (file)
--- 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, \