Skip to content

L
linux
Commit fda33186 authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files
Options

staging:iio:meter:ade7758 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: default avatarJonathan Cameron <jic23@kernel.org>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
parent b3700970
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
drivers/staging/iio/meter/ade7758_core.c
View file @ fda33186
...@@ -649,8 +649,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -649,8 +649,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.extend_name = "raw", .extend_name = "raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_A, AD7758_VOLTAGE), .address = AD7758_WT(AD7758_PHASE_A, AD7758_VOLTAGE),
.scan_index = 0, .scan_index = 0,
.scan_type = { .scan_type = {
...@@ -663,8 +663,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -663,8 +663,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.extend_name = "raw", .extend_name = "raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_A, AD7758_CURRENT), .address = AD7758_WT(AD7758_PHASE_A, AD7758_CURRENT),
.scan_index = 1, .scan_index = 1,
.scan_type = { .scan_type = {
...@@ -677,8 +677,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -677,8 +677,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.extend_name = "apparent_raw", .extend_name = "apparent_raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_A, AD7758_APP_PWR), .address = AD7758_WT(AD7758_PHASE_A, AD7758_APP_PWR),
.scan_index = 2, .scan_index = 2,
.scan_type = { .scan_type = {
...@@ -691,8 +691,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -691,8 +691,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.extend_name = "active_raw", .extend_name = "active_raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_A, AD7758_ACT_PWR), .address = AD7758_WT(AD7758_PHASE_A, AD7758_ACT_PWR),
.scan_index = 3, .scan_index = 3,
.scan_type = { .scan_type = {
...@@ -705,8 +705,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -705,8 +705,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.extend_name = "reactive_raw", .extend_name = "reactive_raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_A, AD7758_REACT_PWR), .address = AD7758_WT(AD7758_PHASE_A, AD7758_REACT_PWR),
.scan_index = 4, .scan_index = 4,
.scan_type = { .scan_type = {
...@@ -719,8 +719,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -719,8 +719,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.extend_name = "raw", .extend_name = "raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_B, AD7758_VOLTAGE), .address = AD7758_WT(AD7758_PHASE_B, AD7758_VOLTAGE),
.scan_index = 5, .scan_index = 5,
.scan_type = { .scan_type = {
...@@ -733,8 +733,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -733,8 +733,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.extend_name = "raw", .extend_name = "raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_B, AD7758_CURRENT), .address = AD7758_WT(AD7758_PHASE_B, AD7758_CURRENT),
.scan_index = 6, .scan_index = 6,
.scan_type = { .scan_type = {
...@@ -747,8 +747,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -747,8 +747,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.extend_name = "apparent_raw", .extend_name = "apparent_raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_B, AD7758_APP_PWR), .address = AD7758_WT(AD7758_PHASE_B, AD7758_APP_PWR),
.scan_index = 7, .scan_index = 7,
.scan_type = { .scan_type = {
...@@ -761,8 +761,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -761,8 +761,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.extend_name = "active_raw", .extend_name = "active_raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_B, AD7758_ACT_PWR), .address = AD7758_WT(AD7758_PHASE_B, AD7758_ACT_PWR),
.scan_index = 8, .scan_index = 8,
.scan_type = { .scan_type = {
...@@ -775,8 +775,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -775,8 +775,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.extend_name = "reactive_raw", .extend_name = "reactive_raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_B, AD7758_REACT_PWR), .address = AD7758_WT(AD7758_PHASE_B, AD7758_REACT_PWR),
.scan_index = 9, .scan_index = 9,
.scan_type = { .scan_type = {
...@@ -789,8 +789,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -789,8 +789,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.extend_name = "raw", .extend_name = "raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_C, AD7758_VOLTAGE), .address = AD7758_WT(AD7758_PHASE_C, AD7758_VOLTAGE),
.scan_index = 10, .scan_index = 10,
.scan_type = { .scan_type = {
...@@ -803,8 +803,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -803,8 +803,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.extend_name = "raw", .extend_name = "raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_C, AD7758_CURRENT), .address = AD7758_WT(AD7758_PHASE_C, AD7758_CURRENT),
.scan_index = 11, .scan_index = 11,
.scan_type = { .scan_type = {
...@@ -817,8 +817,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -817,8 +817,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.extend_name = "apparent_raw", .extend_name = "apparent_raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_C, AD7758_APP_PWR), .address = AD7758_WT(AD7758_PHASE_C, AD7758_APP_PWR),
.scan_index = 12, .scan_index = 12,
.scan_type = { .scan_type = {
...@@ -831,8 +831,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -831,8 +831,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.extend_name = "active_raw", .extend_name = "active_raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_C, AD7758_ACT_PWR), .address = AD7758_WT(AD7758_PHASE_C, AD7758_ACT_PWR),
.scan_index = 13, .scan_index = 13,
.scan_type = { .scan_type = {
...@@ -845,8 +845,8 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -845,8 +845,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.extend_name = "reactive_raw", .extend_name = "reactive_raw",
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
IIO_CHAN_INFO_SCALE_SHARED_BIT, .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.address = AD7758_WT(AD7758_PHASE_C, AD7758_REACT_PWR), .address = AD7758_WT(AD7758_PHASE_C, AD7758_REACT_PWR),
.scan_index = 14, .scan_index = 14,
.scan_type = { .scan_type = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7