Commit a316af4f authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Greg Kroah-Hartman

staging:iio:ade7758: Remove "raw" from channel name

commit b598aacc upstream.

"raw" is a property of a channel, but should not be part of the name of
channel.
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4fdbedf5
...@@ -648,7 +648,6 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -648,7 +648,6 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.extend_name = "raw",
.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 = {
...@@ -660,7 +659,6 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -660,7 +659,6 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_CURRENT, .type = IIO_CURRENT,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.extend_name = "raw",
.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 = {
...@@ -672,7 +670,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -672,7 +670,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_POWER, .type = IIO_POWER,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.extend_name = "apparent_raw", .extend_name = "apparent",
.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 = {
...@@ -684,7 +682,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -684,7 +682,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_POWER, .type = IIO_POWER,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.extend_name = "active_raw", .extend_name = "active",
.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 = {
...@@ -696,7 +694,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -696,7 +694,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_POWER, .type = IIO_POWER,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.extend_name = "reactive_raw", .extend_name = "reactive",
.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 = {
...@@ -708,7 +706,6 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -708,7 +706,6 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.extend_name = "raw",
.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 = {
...@@ -720,7 +717,6 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -720,7 +717,6 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_CURRENT, .type = IIO_CURRENT,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.extend_name = "raw",
.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 = {
...@@ -732,7 +728,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -732,7 +728,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_POWER, .type = IIO_POWER,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.extend_name = "apparent_raw", .extend_name = "apparent",
.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 = {
...@@ -744,7 +740,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -744,7 +740,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_POWER, .type = IIO_POWER,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.extend_name = "active_raw", .extend_name = "active",
.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 = {
...@@ -756,7 +752,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -756,7 +752,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_POWER, .type = IIO_POWER,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.extend_name = "reactive_raw", .extend_name = "reactive",
.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 = {
...@@ -768,7 +764,6 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -768,7 +764,6 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_VOLTAGE, .type = IIO_VOLTAGE,
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.extend_name = "raw",
.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 = {
...@@ -780,7 +775,6 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -780,7 +775,6 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_CURRENT, .type = IIO_CURRENT,
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.extend_name = "raw",
.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 = {
...@@ -792,7 +786,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -792,7 +786,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_POWER, .type = IIO_POWER,
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.extend_name = "apparent_raw", .extend_name = "apparent",
.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 = {
...@@ -804,7 +798,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -804,7 +798,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_POWER, .type = IIO_POWER,
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.extend_name = "active_raw", .extend_name = "active",
.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 = {
...@@ -816,7 +810,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -816,7 +810,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
.type = IIO_POWER, .type = IIO_POWER,
.indexed = 1, .indexed = 1,
.channel = 2, .channel = 2,
.extend_name = "reactive_raw", .extend_name = "reactive",
.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