Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[deliverable/linux.git] / drivers / staging / iio / gyro / adis16060_core.c

diff --git a/drivers/staging/iio/gyro/adis16060_core.c b/drivers/staging/iio/gyro/adis16060_core.c
index ff1b5a82b3d62d022ccb2cb13b0a941dcaabee0c..c0ca7093e0edab2cca150b8623460fe53c5b8ceb 100644 (file)
--- a/drivers/staging/iio/gyro/adis16060_core.c
+++ b/drivers/staging/iio/gyro/adis16060_core.c
@@ -98,11 +98,11 @@ static int adis16060_read_raw(struct iio_dev *indio_dev,
                mutex_unlock(&indio_dev->mlock);
                *val = tval;
                return IIO_VAL_INT;
-       case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+       case IIO_CHAN_INFO_OFFSET:
                *val = -7;
                *val2 = 461117;
                return IIO_VAL_INT_PLUS_MICRO;
-       case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+       case IIO_CHAN_INFO_SCALE:
                *val = 0;
                *val2 = 34000;
                return IIO_VAL_INT_PLUS_MICRO;
@@ -136,8 +136,8 @@ static const struct iio_chan_spec adis16060_channels[] = {
                .type = IIO_TEMP,
                .indexed = 1,
                .channel = 0,
-               .info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-               (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+               .info_mask = IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+               IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                .address = ADIS16060_TEMP_OUT,
        }
 };