summaryrefslogtreecommitdiff
path: root/drivers/staging/iio/light/isl29018.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2011-10-26 17:41:35 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-26 16:35:04 -0800
commit924f8a21dd13223cc1493a916c6769cf73e0d45e (patch)
tree60ec15425748b95730cb779f618d0ab6d0d0fd78 /drivers/staging/iio/light/isl29018.c
parent3014cd97e56d312865d670653adec338a8e5fc0e (diff)
staging:iio: Do not use bitmasks for channel info addresses
Currently the iio framework uses bitmasks for the address field of channel info attributes. This is for historical reasons and no longer required since it will only ever query a single info attribute at once. This patch changes the code to use the non-shifted iio_chan_info_enum values for the info attribute address. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/light/isl29018.c')
-rw-r--r--drivers/staging/iio/light/isl29018.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
index 9dc9e6358394..bed18a74d30c 100644
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/staging/iio/light/isl29018.c
@@ -362,7 +362,7 @@ static int isl29018_write_raw(struct iio_dev *indio_dev,
int ret = -EINVAL;
mutex_lock(&chip->lock);
- if (mask == (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) &&
+ if (mask == IIO_CHAN_INFO_CALIBSCALE_SEPARATE &&
chan->type == IIO_LIGHT) {
chip->lux_scale = val;
ret = 0;
@@ -402,7 +402,7 @@ static int isl29018_read_raw(struct iio_dev *indio_dev,
if (!ret)
ret = IIO_VAL_INT;
break;
- case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
+ case IIO_CHAN_INFO_CALIBSCALE_SEPARATE:
if (chan->type == IIO_LIGHT) {
*val = chip->lux_scale;
ret = IIO_VAL_INT;