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

[~andy/linux] / drivers / staging / iio / accel / adis16201_core.c

diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c
index 9e5791ff2a04ca3e33b528a153f279a916fc23cb..ab8ec7af88b49a80689480bcd43deedad4d2cbab 100644 (file)
--- a/drivers/staging/iio/accel/adis16201_core.c
+++ b/drivers/staging/iio/accel/adis16201_core.c
@@ -134,14 +134,14 @@ static const struct iio_chan_spec adis16201_channels[] = {
        ADIS_SUPPLY_CHAN(ADIS16201_SUPPLY_OUT, ADIS16201_SCAN_SUPPLY, 12),
        ADIS_TEMP_CHAN(ADIS16201_TEMP_OUT, ADIS16201_SCAN_TEMP, 12),
        ADIS_ACCEL_CHAN(X, ADIS16201_XACCL_OUT, ADIS16201_SCAN_ACC_X,
-               IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),
+               BIT(IIO_CHAN_INFO_CALIBBIAS), 14),
        ADIS_ACCEL_CHAN(Y, ADIS16201_YACCL_OUT, ADIS16201_SCAN_ACC_Y,
-               IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),
+               BIT(IIO_CHAN_INFO_CALIBBIAS), 14),
        ADIS_AUX_ADC_CHAN(ADIS16201_AUX_ADC, ADIS16201_SCAN_AUX_ADC, 12),
        ADIS_INCLI_CHAN(X, ADIS16201_XINCL_OUT, ADIS16201_SCAN_INCLI_X,
-               IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),
+               BIT(IIO_CHAN_INFO_CALIBBIAS), 14),
        ADIS_INCLI_CHAN(X, ADIS16201_YINCL_OUT, ADIS16201_SCAN_INCLI_Y,
-               IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),
+               BIT(IIO_CHAN_INFO_CALIBBIAS), 14),
        IIO_CHAN_SOFT_TIMESTAMP(7)
 };