evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging:iio:cdc:ad7152 move to info_mask_(shared_by_type/separate)

Browse source 
The original info_mask is going away in favour of the broken out versions.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
Jonathan Cameron 2013-02-27 19:38:12 +00:00
parent 0221519534
commit c24e97b70d
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/staging/iio/cdc/ad7152.c
View file

@ -436,38 +436,38 @@ static const struct iio_chan_spec ad7152_channels[] = {
.type = IIO_CAPACITANCE, .type = IIO_CAPACITANCE,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | BIT(IIO_CHAN_INFO_CALIBSCALE) |
IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | BIT(IIO_CHAN_INFO_CALIBBIAS) |
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, BIT(IIO_CHAN_INFO_SCALE),
}, { }, {
.type = IIO_CAPACITANCE, .type = IIO_CAPACITANCE,
.differential = 1, .differential = 1,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.channel2 = 2, .channel2 = 2,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | BIT(IIO_CHAN_INFO_CALIBSCALE) |
IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | BIT(IIO_CHAN_INFO_CALIBBIAS) |
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, BIT(IIO_CHAN_INFO_SCALE),
}, { }, {
.type = IIO_CAPACITANCE, .type = IIO_CAPACITANCE,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | BIT(IIO_CHAN_INFO_CALIBSCALE) |
IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | BIT(IIO_CHAN_INFO_CALIBBIAS) |
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, BIT(IIO_CHAN_INFO_SCALE),
}, { }, {
.type = IIO_CAPACITANCE, .type = IIO_CAPACITANCE,
.differential = 1, .differential = 1,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.channel2 = 3, .channel2 = 3,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | BIT(IIO_CHAN_INFO_CALIBSCALE) |
IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | BIT(IIO_CHAN_INFO_CALIBBIAS) |
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, BIT(IIO_CHAN_INFO_SCALE),
} }
}; };
/* /*