]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
iio:adc:max1363 move to info_mask_(shared_by_type/separate)
authorJonathan Cameron <jic23@kernel.org>
Tue, 19 Feb 2013 21:11:35 +0000 (21:11 +0000)
committerJonathan Cameron <jic23@kernel.org>
Sun, 17 Mar 2013 19:49:13 +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>
drivers/iio/adc/max1363.c

index 6c1cfb74bdfc394c0a04b6653d23669edfd1568b..9e6da72ad82324d1a7b2d11294d9da76616408ba 100644 (file)
@@ -427,15 +427,15 @@ static const enum max1363_modes max1363_mode_list[] = {
 #define MAX1363_EV_M                                           \
        (IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING)      \
         | IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING))
-#define MAX1363_INFO_MASK (IIO_CHAN_INFO_RAW_SEPARATE_BIT |    \
-                          IIO_CHAN_INFO_SCALE_SHARED_BIT)
+
 #define MAX1363_CHAN_U(num, addr, si, bits, evmask)                    \
        {                                                               \
                .type = IIO_VOLTAGE,                                    \
                .indexed = 1,                                           \
                .channel = num,                                         \
                .address = addr,                                        \
-               .info_mask = MAX1363_INFO_MASK,                         \
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),           \
+               .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),   \
                .datasheet_name = "AIN"#num,                            \
                .scan_type = {                                          \
                        .sign = 'u',                                    \
@@ -456,7 +456,8 @@ static const enum max1363_modes max1363_mode_list[] = {
                .channel = num,                                         \
                .channel2 = num2,                                       \
                .address = addr,                                        \
-               .info_mask = MAX1363_INFO_MASK,                         \
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),           \
+               .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),   \
                .datasheet_name = "AIN"#num"-AIN"#num2,                 \
                .scan_type = {                                          \
                        .sign = 's',                                    \