diff options
| author | Jonathan Cameron <jic23@kernel.org> | 2013-02-27 19:37:07 +0000 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-03-17 19:49:38 +0000 |
| commit | 4ff30e0a0c63670e1af7635dc0659bc74c2ffe13 (patch) | |
| tree | 954d99b508d7bef515bd8bf246da2cf743f9d6b4 /drivers/staging/iio/adc | |
| parent | a8b21c5ccf47ec4e1fffcbc06a52592bb165b582 (diff) | |
| download | linux-4ff30e0a0c63670e1af7635dc0659bc74c2ffe13.tar.bz2 | |
staging:iio:adc:ad7280a 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>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Diffstat (limited to 'drivers/staging/iio/adc')
| -rw-r--r-- | drivers/staging/iio/adc/ad7280a.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c index 1f190c1b12a6..2fd6ee3c1902 100644 --- a/drivers/staging/iio/adc/ad7280a.c +++ b/drivers/staging/iio/adc/ad7280a.c @@ -503,9 +503,10 @@ static int ad7280_channel_init(struct ad7280_state *st) st->channels[cnt].channel = (dev * 6) + ch - 6; } st->channels[cnt].indexed = 1; - st->channels[cnt].info_mask = - IIO_CHAN_INFO_RAW_SEPARATE_BIT | - IIO_CHAN_INFO_SCALE_SHARED_BIT; + st->channels[cnt].info_mask_separate = + BIT(IIO_CHAN_INFO_RAW); + st->channels[cnt].info_mask_shared_by_type = + BIT(IIO_CHAN_INFO_SCALE); st->channels[cnt].address = AD7280A_DEVADDR(dev) << 8 | ch; st->channels[cnt].scan_index = cnt; @@ -521,9 +522,8 @@ static int ad7280_channel_init(struct ad7280_state *st) st->channels[cnt].channel2 = dev * 6; st->channels[cnt].address = AD7280A_ALL_CELLS; st->channels[cnt].indexed = 1; - st->channels[cnt].info_mask = - IIO_CHAN_INFO_RAW_SEPARATE_BIT | - IIO_CHAN_INFO_SCALE_SHARED_BIT; + st->channels[cnt].info_mask_separate = BIT(IIO_CHAN_INFO_RAW); + st->channels[cnt].info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE); st->channels[cnt].scan_index = cnt; st->channels[cnt].scan_type.sign = 'u'; st->channels[cnt].scan_type.realbits = 32; |