leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging:iio:adc:ad799x 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: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
Jonathan Cameron 2013-02-27 19:37:47 +00:00
parent 7593908f8f
commit 202c7db091
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
drivers/staging/iio/adc/ad799x_core.c
View File

@ -467,7 +467,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 0, .scan_index = 0,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
}, },
@ -475,7 +475,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 1, .scan_index = 1,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
}, },
@ -483,7 +483,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 2, .scan_index = 2,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
}, },
@ -491,7 +491,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 3, .channel = 3,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 3, .scan_index = 3,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
}, },
@ -507,7 +507,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 0, .scan_index = 0,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
}, },
@ -515,7 +515,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 1, .scan_index = 1,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
}, },
@ -523,7 +523,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 2, .scan_index = 2,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
}, },
@ -531,7 +531,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 3, .channel = 3,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 3, .scan_index = 3,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
}, },
@ -547,7 +547,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 0, .scan_index = 0,
.scan_type = IIO_ST('u', 8, 16, 4), .scan_type = IIO_ST('u', 8, 16, 4),
}, },
@ -555,7 +555,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 1, .scan_index = 1,
.scan_type = IIO_ST('u', 8, 16, 4), .scan_type = IIO_ST('u', 8, 16, 4),
}, },
@ -563,7 +563,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 2, .scan_index = 2,
.scan_type = IIO_ST('u', 8, 16, 4), .scan_type = IIO_ST('u', 8, 16, 4),
}, },
@ -571,7 +571,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 3, .channel = 3,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 3, .scan_index = 3,
.scan_type = IIO_ST('u', 8, 16, 4), .scan_type = IIO_ST('u', 8, 16, 4),
}, },
@ -587,7 +587,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 0, .scan_index = 0,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -596,7 +596,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 1, .scan_index = 1,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -614,7 +614,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 0, .scan_index = 0,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -624,7 +624,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.scan_index = 1, .scan_index = 1,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
}, },
@ -632,7 +632,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 2, .scan_index = 2,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -641,7 +641,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 3, .channel = 3,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 3, .scan_index = 3,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -659,7 +659,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 0, .scan_index = 0,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -668,7 +668,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 1, .scan_index = 1,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -677,7 +677,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 2, .scan_index = 2,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -686,7 +686,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 3, .channel = 3,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 3, .scan_index = 3,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -704,7 +704,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 0, .scan_index = 0,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -713,7 +713,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 1, .scan_index = 1,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -722,7 +722,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 2, .scan_index = 2,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -731,7 +731,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 3, .channel = 3,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 3, .scan_index = 3,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -740,7 +740,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 4, .channel = 4,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 4, .scan_index = 4,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
}, },
@ -748,7 +748,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 5, .channel = 5,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 5, .scan_index = 5,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
}, },
@ -756,7 +756,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 6, .channel = 6,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 6, .scan_index = 6,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
}, },
@ -764,7 +764,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 7, .channel = 7,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 7, .scan_index = 7,
.scan_type = IIO_ST('u', 10, 16, 2), .scan_type = IIO_ST('u', 10, 16, 2),
}, },
@ -781,7 +781,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 0, .scan_index = 0,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -790,7 +790,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 1, .scan_index = 1,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -799,7 +799,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 2, .scan_index = 2,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -808,7 +808,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 3, .channel = 3,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 3, .scan_index = 3,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
.event_mask = AD799X_EV_MASK, .event_mask = AD799X_EV_MASK,
@ -817,7 +817,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 4, .channel = 4,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 4, .scan_index = 4,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
}, },
@ -825,7 +825,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 5, .channel = 5,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 5, .scan_index = 5,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
}, },
@ -833,7 +833,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 6, .channel = 6,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 6, .scan_index = 6,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
}, },
@ -841,7 +841,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 7, .channel = 7,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.scan_index = 7, .scan_index = 7,
.scan_type = IIO_ST('u', 12, 16, 0), .scan_type = IIO_ST('u', 12, 16, 0),
}, },