Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b598aacc authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron
Browse files

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



"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>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 79fa64eb

drivers/staging/iio/meter/ade7758_core.c

+9 −15
Original line number Diff line number Diff line
@@ -634,7 +634,6 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_VOLTAGE,

		.indexed = 1,

		.channel = 0,

		.extend_name = "raw",

		.address = AD7758_WT(AD7758_PHASE_A, AD7758_VOLTAGE),

		.scan_index = 0,

		.scan_type = {
@@ -646,7 +645,6 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_CURRENT,

		.indexed = 1,

		.channel = 0,

		.extend_name = "raw",

		.address = AD7758_WT(AD7758_PHASE_A, AD7758_CURRENT),

		.scan_index = 1,

		.scan_type = {
@@ -658,7 +656,7 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_POWER,

		.indexed = 1,

		.channel = 0,

		.extend_name = "apparent_raw",

		.extend_name = "apparent",

		.address = AD7758_WT(AD7758_PHASE_A, AD7758_APP_PWR),

		.scan_index = 2,

		.scan_type = {
@@ -670,7 +668,7 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_POWER,

		.indexed = 1,

		.channel = 0,

		.extend_name = "active_raw",

		.extend_name = "active",

		.address = AD7758_WT(AD7758_PHASE_A, AD7758_ACT_PWR),

		.scan_index = 3,

		.scan_type = {
@@ -682,7 +680,7 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_POWER,

		.indexed = 1,

		.channel = 0,

		.extend_name = "reactive_raw",

		.extend_name = "reactive",

		.address = AD7758_WT(AD7758_PHASE_A, AD7758_REACT_PWR),

		.scan_index = 4,

		.scan_type = {
@@ -694,7 +692,6 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_VOLTAGE,

		.indexed = 1,

		.channel = 1,

		.extend_name = "raw",

		.address = AD7758_WT(AD7758_PHASE_B, AD7758_VOLTAGE),

		.scan_index = 5,

		.scan_type = {
@@ -706,7 +703,6 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_CURRENT,

		.indexed = 1,

		.channel = 1,

		.extend_name = "raw",

		.address = AD7758_WT(AD7758_PHASE_B, AD7758_CURRENT),

		.scan_index = 6,

		.scan_type = {
@@ -718,7 +714,7 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_POWER,

		.indexed = 1,

		.channel = 1,

		.extend_name = "apparent_raw",

		.extend_name = "apparent",

		.address = AD7758_WT(AD7758_PHASE_B, AD7758_APP_PWR),

		.scan_index = 7,

		.scan_type = {
@@ -730,7 +726,7 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_POWER,

		.indexed = 1,

		.channel = 1,

		.extend_name = "active_raw",

		.extend_name = "active",

		.address = AD7758_WT(AD7758_PHASE_B, AD7758_ACT_PWR),

		.scan_index = 8,

		.scan_type = {
@@ -742,7 +738,7 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_POWER,

		.indexed = 1,

		.channel = 1,

		.extend_name = "reactive_raw",

		.extend_name = "reactive",

		.address = AD7758_WT(AD7758_PHASE_B, AD7758_REACT_PWR),

		.scan_index = 9,

		.scan_type = {
@@ -754,7 +750,6 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_VOLTAGE,

		.indexed = 1,

		.channel = 2,

		.extend_name = "raw",

		.address = AD7758_WT(AD7758_PHASE_C, AD7758_VOLTAGE),

		.scan_index = 10,

		.scan_type = {
@@ -766,7 +761,6 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_CURRENT,

		.indexed = 1,

		.channel = 2,

		.extend_name = "raw",

		.address = AD7758_WT(AD7758_PHASE_C, AD7758_CURRENT),

		.scan_index = 11,

		.scan_type = {
@@ -778,7 +772,7 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_POWER,

		.indexed = 1,

		.channel = 2,

		.extend_name = "apparent_raw",

		.extend_name = "apparent",

		.address = AD7758_WT(AD7758_PHASE_C, AD7758_APP_PWR),

		.scan_index = 12,

		.scan_type = {
@@ -790,7 +784,7 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_POWER,

		.indexed = 1,

		.channel = 2,

		.extend_name = "active_raw",

		.extend_name = "active",

		.address = AD7758_WT(AD7758_PHASE_C, AD7758_ACT_PWR),

		.scan_index = 13,

		.scan_type = {
@@ -802,7 +796,7 @@ static const struct iio_chan_spec ade7758_channels[] = { 
		.type = IIO_POWER,

		.indexed = 1,

		.channel = 2,

		.extend_name = "reactive_raw",

		.extend_name = "reactive",

		.address = AD7758_WT(AD7758_PHASE_C, AD7758_REACT_PWR),

		.scan_index = 14,

		.scan_type = {