]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging:iio:cdc:ad7150 move to info_mask_(shared_by_type/separate)
authorJonathan Cameron <jic23@kernel.org>
Wed, 27 Feb 2013 19:37:59 +0000 (19:37 +0000)
committerJonathan Cameron <jic23@kernel.org>
Sun, 17 Mar 2013 19:49:39 +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>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
drivers/staging/iio/cdc/ad7150.c

index 3c608c14dd998ecb6b45054e9637e26b7ce516bf..687dd2c914378a0a3a77ff4714eff02f77abd0ef 100644 (file)
@@ -429,8 +429,8 @@ static const struct iio_chan_spec ad7150_channels[] = {
                .type = IIO_CAPACITANCE,
                .indexed = 1,
                .channel = 0,
-               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-               IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE_BIT,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+               BIT(IIO_CHAN_INFO_AVERAGE_RAW),
                .event_mask =
                IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |
                IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING) |
@@ -442,8 +442,8 @@ static const struct iio_chan_spec ad7150_channels[] = {
                .type = IIO_CAPACITANCE,
                .indexed = 1,
                .channel = 1,
-               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-               IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE_BIT,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+               BIT(IIO_CHAN_INFO_AVERAGE_RAW),
                .event_mask =
                IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |
                IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING) |