]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging:iio:accel:lis3l02dq move to info_mask_(shared_by_type/separate)
authorJonathan Cameron <jic23@kernel.org>
Wed, 27 Feb 2013 19:36:35 +0000 (19:36 +0000)
committerJonathan Cameron <jic23@kernel.org>
Sun, 17 Mar 2013 19:49:38 +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/staging/iio/accel/lis3l02dq_core.c

index 0e019306439cd86fff57ab2e7b7bd28cb1f9d7ad..1bfe5d81792ba47c9aae04eeb9f0174e9653289e 100644 (file)
@@ -501,12 +501,6 @@ static irqreturn_t lis3l02dq_event_handler(int irq, void *private)
        return IRQ_HANDLED;
 }
 
-#define LIS3L02DQ_INFO_MASK                            \
-       (IIO_CHAN_INFO_RAW_SEPARATE_BIT |               \
-        IIO_CHAN_INFO_SCALE_SHARED_BIT |               \
-        IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |        \
-        IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT)
-
 #define LIS3L02DQ_EVENT_MASK                                   \
        (IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |    \
         IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING))
@@ -516,7 +510,10 @@ static irqreturn_t lis3l02dq_event_handler(int irq, void *private)
                .type = IIO_ACCEL,                              \
                .modified = 1,                                  \
                .channel2 = mod,                                \
-               .info_mask =  LIS3L02DQ_INFO_MASK,              \
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |  \
+                       BIT(IIO_CHAN_INFO_CALIBSCALE) |         \
+                       BIT(IIO_CHAN_INFO_CALIBBIAS),           \
+               .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
                .address = index,                               \
                .scan_index = index,                            \
                .scan_type = {                                  \