Skip to content

L
linux
Commit d8eb1f1f authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Luis Henriques
Browse files
Options

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 avatarLuis Henriques <luis.henriques@canonical.com>
parent d92fb58e
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 15 deletions
drivers/staging/iio/meter/ade7758_core.c
View file @ d8eb1f1f
...@@ -630,7 +630,6 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -630,7 +630,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 = {
...@@ -642,7 +641,6 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -642,7 +641,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 = {
...@@ -654,7 +652,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -654,7 +652,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 = {
...@@ -666,7 +664,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -666,7 +664,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 = {
...@@ -678,7 +676,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -678,7 +676,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 = {
...@@ -690,7 +688,6 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -690,7 +688,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 = {
...@@ -702,7 +699,6 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -702,7 +699,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 = {
...@@ -714,7 +710,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -714,7 +710,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 = {
...@@ -726,7 +722,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -726,7 +722,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 = {
...@@ -738,7 +734,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -738,7 +734,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 = {
...@@ -750,7 +746,6 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -750,7 +746,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 = {
...@@ -762,7 +757,6 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -762,7 +757,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 = {
...@@ -774,7 +768,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -774,7 +768,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 = {
...@@ -786,7 +780,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -786,7 +780,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 = {
...@@ -798,7 +792,7 @@ static const struct iio_chan_spec ade7758_channels[] = { ...@@ -798,7 +792,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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7