]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging:iio:impedance:ad5933 move to info_mask_(shared_by_type/separate)
authorJonathan Cameron <jic23@kernel.org>
Wed, 27 Feb 2013 19:39:28 +0000 (19:39 +0000)
committerJonathan Cameron <jic23@kernel.org>
Sun, 17 Mar 2013 19:49:40 +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: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
drivers/staging/iio/impedance-analyzer/ad5933.c

index 440e2261e8cb70ee338c5beff46948f23ab6dcf9..6330af656a0f536d6a56580a5503eac75bdd3e53 100644 (file)
@@ -113,7 +113,7 @@ static const struct iio_chan_spec ad5933_channels[] = {
                .type = IIO_TEMP,
                .indexed = 1,
                .channel = 0,
-               .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
                .address = AD5933_REG_TEMP_DATA,
                .scan_type = {
                        .sign = 's',
@@ -125,8 +125,8 @@ static const struct iio_chan_spec ad5933_channels[] = {
                .indexed = 1,
                .channel = 0,
                .extend_name = "real_raw",
-               .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),
                .address = AD5933_REG_REAL_DATA,
                .scan_index = 0,
                .scan_type = {
@@ -139,8 +139,8 @@ static const struct iio_chan_spec ad5933_channels[] = {
                .indexed = 1,
                .channel = 0,
                .extend_name = "imag_raw",
-               .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),
                .address = AD5933_REG_IMAG_DATA,
                .scan_index = 1,
                .scan_type = {