iio:light:tsl2563 move to info_mask_(shared_by_type/separate)
authorJonathan Cameron <jic23@kernel.org>
Wed, 27 Feb 2013 19:33:40 +0000 (19:33 +0000)
committerJonathan Cameron <jic23@kernel.org>
Sun, 17 Mar 2013 19:49:37 +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: Jon Brenner <jbrenner@taosinc.com>

drivers/iio/light/tsl2563.c

index fd8be69..1f529f3 100644 (file)
@@ -530,14 +530,14 @@ static const struct iio_chan_spec tsl2563_channels[] = {
        {
                .type = IIO_LIGHT,
                .indexed = 1,
-               .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
                .channel = 0,
        }, {
                .type = IIO_INTENSITY,
                .modified = 1,
                .channel2 = IIO_MOD_LIGHT_BOTH,
-               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-               IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+               BIT(IIO_CHAN_INFO_CALIBSCALE),
                .event_mask = (IIO_EV_BIT(IIO_EV_TYPE_THRESH,
                                          IIO_EV_DIR_RISING) |
                               IIO_EV_BIT(IIO_EV_TYPE_THRESH,
@@ -546,8 +546,8 @@ static const struct iio_chan_spec tsl2563_channels[] = {
                .type = IIO_INTENSITY,
                .modified = 1,
                .channel2 = IIO_MOD_LIGHT_IR,
-               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-               IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
+               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+               BIT(IIO_CHAN_INFO_CALIBSCALE),
        }
 };