iio:gyro:itg3200_core move to info_mask_(shared_by_type/separate)
authorJonathan Cameron <jic23@kernel.org>
Wed, 27 Feb 2013 19:30:36 +0000 (19:30 +0000)
committerJonathan Cameron <jic23@kernel.org>
Sun, 17 Mar 2013 19:49:35 +0000 (19:49 +0000)
The original info_mask is going away in favour of the broken out versions.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
cc: Manuel Stahl <manuel.stahl@iis.fraunhofer.de>

drivers/iio/gyro/itg3200_core.c

index df2e6aa5d73bd2d4aee4b03d15eb75f2df68fda7..d66605d2629d810b95688785622f993e7322a897 100644 (file)
@@ -248,12 +248,6 @@ err_ret:
        return ret;
 }
 
-#define ITG3200_TEMP_INFO_MASK (IIO_CHAN_INFO_OFFSET_SHARED_BIT | \
-                                IIO_CHAN_INFO_SCALE_SHARED_BIT | \
-                                IIO_CHAN_INFO_RAW_SEPARATE_BIT)
-#define ITG3200_GYRO_INFO_MASK (IIO_CHAN_INFO_SCALE_SHARED_BIT | \
-                                IIO_CHAN_INFO_RAW_SEPARATE_BIT)
-
 #define ITG3200_ST                                             \
        { .sign = 's', .realbits = 16, .storagebits = 16, .endianness = IIO_BE }
 
@@ -261,7 +255,8 @@ err_ret:
        .type = IIO_ANGL_VEL, \
        .modified = 1, \
        .channel2 = IIO_MOD_ ## _mod, \
-       .info_mask = ITG3200_GYRO_INFO_MASK, \
+       .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
+       .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
        .address = ITG3200_REG_GYRO_ ## _mod ## OUT_H, \
        .scan_index = ITG3200_SCAN_GYRO_ ## _mod, \
        .scan_type = ITG3200_ST, \
@@ -271,7 +266,9 @@ static const struct iio_chan_spec itg3200_channels[] = {
        {
                .type = IIO_TEMP,
                .channel2 = IIO_NO_MOD,
-               .info_mask = ITG3200_TEMP_INFO_MASK,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+               .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
+               BIT(IIO_CHAN_INFO_SCALE),
                .address = ITG3200_REG_TEMP_OUT_H,
                .scan_index = ITG3200_SCAN_TEMP,
                .scan_type = ITG3200_ST,