From: Jonathan Cameron <jic23@kernel.org>
To: Lars-Peter Clausen <lars@metafoo.de>
Cc: Hartmut Knaack <knaack.h@gmx.de>,
Peter Meerwald <pmeerw@pmeerw.net>,
linux-iio@vger.kernel.org
Subject: Re: [PATCH 3/3] staging:iio:ade7758: Remove "raw" from channel name
Date: Wed, 05 Nov 2014 14:02:03 +0000 [thread overview]
Message-ID: <545A2DDB.2030100@kernel.org> (raw)
In-Reply-To: <1415120596-21704-3-git-send-email-lars@metafoo.de>
On 04/11/14 17:03, Lars-Peter Clausen wrote:
> "raw" is a property of a channel, but should not be part of the name of
> channel.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Applied to the fixes-togreg branch of iio.git and marked for stable.
> ---
> drivers/staging/iio/meter/ade7758_core.c | 24 +++++++++---------------
> 1 file changed, 9 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
> index 214b03e..94d9914 100644
> --- a/drivers/staging/iio/meter/ade7758_core.c
> +++ b/drivers/staging/iio/meter/ade7758_core.c
> @@ -630,7 +630,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 = {
> @@ -642,7 +641,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 = {
> @@ -654,7 +652,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 = {
> @@ -666,7 +664,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 = {
> @@ -678,7 +676,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 = {
> @@ -690,7 +688,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 = {
> @@ -702,7 +699,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 = {
> @@ -714,7 +710,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 = {
> @@ -726,7 +722,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 = {
> @@ -738,7 +734,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 = {
> @@ -750,7 +746,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 = {
> @@ -762,7 +757,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 = {
> @@ -774,7 +768,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 = {
> @@ -786,7 +780,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 = {
> @@ -798,7 +792,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 = {
>
next prev parent reply other threads:[~2014-11-05 14:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-04 17:03 [PATCH 1/3] staging:iio:ade7758: Fix NULL pointer deref when enabling buffer Lars-Peter Clausen
2014-11-04 17:03 ` [PATCH 2/3] staging:iio:ade7758: Fix check if channels are enabled in prenable Lars-Peter Clausen
2014-11-05 14:01 ` Jonathan Cameron
2014-11-04 17:03 ` [PATCH 3/3] staging:iio:ade7758: Remove "raw" from channel name Lars-Peter Clausen
2014-11-05 14:02 ` Jonathan Cameron [this message]
2014-11-05 14:00 ` [PATCH 1/3] staging:iio:ade7758: Fix NULL pointer deref when enabling buffer Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=545A2DDB.2030100@kernel.org \
--to=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.