diff options
author | Jonathan Cameron <jic23@kernel.org> | 2013-02-27 14:33:40 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-03-17 15:49:37 -0400 |
commit | d292ef8da38aed8e01531c76c66d7755406cf9b8 (patch) | |
tree | f7edeb9221a6478fe0379795dc6d3798447cc139 /drivers/iio | |
parent | d113de62bae0a42e903501ed034cb0d73e140bac (diff) |
iio:light:tsl2563 move to info_mask_(shared_by_type/separate)
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>
Diffstat (limited to 'drivers/iio')
-rw-r--r-- | drivers/iio/light/tsl2563.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c index fd8be69b7d05..1f529f36f138 100644 --- a/drivers/iio/light/tsl2563.c +++ b/drivers/iio/light/tsl2563.c | |||
@@ -530,14 +530,14 @@ static const struct iio_chan_spec tsl2563_channels[] = { | |||
530 | { | 530 | { |
531 | .type = IIO_LIGHT, | 531 | .type = IIO_LIGHT, |
532 | .indexed = 1, | 532 | .indexed = 1, |
533 | .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT, | 533 | .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED), |
534 | .channel = 0, | 534 | .channel = 0, |
535 | }, { | 535 | }, { |
536 | .type = IIO_INTENSITY, | 536 | .type = IIO_INTENSITY, |
537 | .modified = 1, | 537 | .modified = 1, |
538 | .channel2 = IIO_MOD_LIGHT_BOTH, | 538 | .channel2 = IIO_MOD_LIGHT_BOTH, |
539 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | | 539 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | |
540 | IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, | 540 | BIT(IIO_CHAN_INFO_CALIBSCALE), |
541 | .event_mask = (IIO_EV_BIT(IIO_EV_TYPE_THRESH, | 541 | .event_mask = (IIO_EV_BIT(IIO_EV_TYPE_THRESH, |
542 | IIO_EV_DIR_RISING) | | 542 | IIO_EV_DIR_RISING) | |
543 | IIO_EV_BIT(IIO_EV_TYPE_THRESH, | 543 | IIO_EV_BIT(IIO_EV_TYPE_THRESH, |
@@ -546,8 +546,8 @@ static const struct iio_chan_spec tsl2563_channels[] = { | |||
546 | .type = IIO_INTENSITY, | 546 | .type = IIO_INTENSITY, |
547 | .modified = 1, | 547 | .modified = 1, |
548 | .channel2 = IIO_MOD_LIGHT_IR, | 548 | .channel2 = IIO_MOD_LIGHT_IR, |
549 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | | 549 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | |
550 | IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, | 550 | BIT(IIO_CHAN_INFO_CALIBSCALE), |
551 | } | 551 | } |
552 | }; | 552 | }; |
553 | 553 | ||