summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@kernel.org>2013-02-27 19:36:45 (GMT)
committerJonathan Cameron <jic23@kernel.org>2013-03-17 19:49:38 (GMT)
commita8b21c5ccf47ec4e1fffcbc06a52592bb165b582 (patch)
treef475181b0a9de0fa8207eb907738ff60dcbb7ffc
parentb1177167c774a016c3c16f5b14d3cdcc4d1021d0 (diff)
downloadlinux-a8b21c5ccf47ec4e1fffcbc06a52592bb165b582.tar.xz
staging:iio:accel:sca3000 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>
-rw-r--r--drivers/staging/iio/accel/sca3000_core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index 14683f5..32950ad 100644
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -419,8 +419,6 @@ static IIO_DEVICE_ATTR(measurement_mode, S_IRUGO | S_IWUSR,
static IIO_DEVICE_ATTR(revision, S_IRUGO, sca3000_show_rev, NULL, 0);
-#define SCA3000_INFO_MASK \
- IIO_CHAN_INFO_RAW_SEPARATE_BIT | IIO_CHAN_INFO_SCALE_SHARED_BIT
#define SCA3000_EVENT_MASK \
(IIO_EV_BIT(IIO_EV_TYPE_MAG, IIO_EV_DIR_RISING))
@@ -429,7 +427,8 @@ static IIO_DEVICE_ATTR(revision, S_IRUGO, sca3000_show_rev, NULL, 0);
.type = IIO_ACCEL, \
.modified = 1, \
.channel2 = mod, \
- .info_mask = SCA3000_INFO_MASK, \
+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),\
.address = index, \
.scan_index = index, \
.scan_type = { \