From: Lars-Peter Clausen <lars@metafoo.de>
To: Jonathan Cameron <jic23@kernel.org>
Cc: linux-iio@vger.kernel.org, device-drivers-devel@blackfin.uclinux.org
Subject: Re: [PATCH 13/14] staging:iio:meter:ade7758 unwind use of IIO_CHAN macro.
Date: Wed, 11 Apr 2012 13:47:15 +0200 [thread overview]
Message-ID: <4F856F43.9030302@metafoo.de> (raw)
In-Reply-To: <1334089310-22576-14-git-send-email-jic23@kernel.org>
On 04/10/2012 10:21 PM, Jonathan Cameron wrote:
> This macro is being removed to simplify ongoing maintenance
> so we need to unwind and remaining users.
>
> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Couldn't spot any real differences to the autogenerated cocci patch.
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
> ---
> drivers/staging/iio/meter/ade7758_core.c | 256 +++++++++++++++++++++++-------
> 1 file changed, 196 insertions(+), 60 deletions(-)
>
> diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
> index 9374d6b..4d6bffa 100644
> --- a/drivers/staging/iio/meter/ade7758_core.c
> +++ b/drivers/staging/iio/meter/ade7758_core.c
> @@ -662,66 +662,202 @@ static const struct attribute_group ade7758_attribute_group = {
> };
>
> static struct iio_chan_spec ade7758_channels[] = {
> - IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "raw", 0, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_A, AD7758_VOLTAGE),
> - 0, IIO_ST('s', 24, 32, 0), 0),
> - IIO_CHAN(IIO_CURRENT, 0, 1, 0, "raw", 0, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_A, AD7758_CURRENT),
> - 1, IIO_ST('s', 24, 32, 0), 0),
> - IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent_raw", 0, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_A, AD7758_APP_PWR),
> - 2, IIO_ST('s', 24, 32, 0), 0),
> - IIO_CHAN(IIO_POWER, 0, 1, 0, "active_raw", 0, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_A, AD7758_ACT_PWR),
> - 3, IIO_ST('s', 24, 32, 0), 0),
> - IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive_raw", 0, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_A, AD7758_REACT_PWR),
> - 4, IIO_ST('s', 24, 32, 0), 0),
> - IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "raw", 1, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_B, AD7758_VOLTAGE),
> - 5, IIO_ST('s', 24, 32, 0), 0),
> - IIO_CHAN(IIO_CURRENT, 0, 1, 0, "raw", 1, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_B, AD7758_CURRENT),
> - 6, IIO_ST('s', 24, 32, 0), 0),
> - IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent_raw", 1, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_B, AD7758_APP_PWR),
> - 7, IIO_ST('s', 24, 32, 0), 0),
> - IIO_CHAN(IIO_POWER, 0, 1, 0, "active_raw", 1, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_B, AD7758_ACT_PWR),
> - 8, IIO_ST('s', 24, 32, 0), 0),
> - IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive_raw", 1, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_B, AD7758_REACT_PWR),
> - 9, IIO_ST('s', 24, 32, 0), 0),
> - IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "raw", 2, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_C, AD7758_VOLTAGE),
> - 10, IIO_ST('s', 24, 32, 0), 0),
> - IIO_CHAN(IIO_CURRENT, 0, 1, 0, "raw", 2, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_C, AD7758_CURRENT),
> - 11, IIO_ST('s', 24, 32, 0), 0),
> - IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent_raw", 2, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_C, AD7758_APP_PWR),
> - 12, IIO_ST('s', 24, 32, 0), 0),
> - IIO_CHAN(IIO_POWER, 0, 1, 0, "active_raw", 2, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_C, AD7758_ACT_PWR),
> - 13, IIO_ST('s', 24, 32, 0), 0),
> - IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive_raw", 2, 0,
> - IIO_CHAN_INFO_SCALE_SHARED_BIT,
> - AD7758_WT(AD7758_PHASE_C, AD7758_REACT_PWR),
> - 14, IIO_ST('s', 24, 32, 0), 0),
> + {
> + .type = IIO_VOLTAGE,
> + .indexed = 1,
> + .channel = 0,
> + .extend_name = "raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_A, AD7758_VOLTAGE),
> + .scan_index = 0,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + }, {
> + .type = IIO_CURRENT,
> + .indexed = 1,
> + .channel = 0,
> + .extend_name = "raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_A, AD7758_CURRENT),
> + .scan_index = 1,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + }, {
> + .type = IIO_POWER,
> + .indexed = 1,
> + .channel = 0,
> + .extend_name = "apparent_raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_A, AD7758_APP_PWR),
> + .scan_index = 2,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + }, {
> + .type = IIO_POWER,
> + .indexed = 1,
> + .channel = 0,
> + .extend_name = "active_raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_A, AD7758_ACT_PWR),
> + .scan_index = 3,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + }, {
> + .type = IIO_POWER,
> + .indexed = 1,
> + .channel = 0,
> + .extend_name = "reactive_raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_A, AD7758_REACT_PWR),
> + .scan_index = 4,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + }, {
> + .type = IIO_VOLTAGE,
> + .indexed = 1,
> + .channel = 1,
> + .extend_name = "raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_B, AD7758_VOLTAGE),
> + .scan_index = 5,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + }, {
> + .type = IIO_CURRENT,
> + .indexed = 1,
> + .channel = 1,
> + .extend_name = "raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_B, AD7758_CURRENT),
> + .scan_index = 6,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + }, {
> + .type = IIO_POWER,
> + .indexed = 1,
> + .channel = 1,
> + .extend_name = "apparent_raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_B, AD7758_APP_PWR),
> + .scan_index = 7,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + }, {
> + .type = IIO_POWER,
> + .indexed = 1,
> + .channel = 1,
> + .extend_name = "active_raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_B, AD7758_ACT_PWR),
> + .scan_index = 8,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + }, {
> + .type = IIO_POWER,
> + .indexed = 1,
> + .channel = 1,
> + .extend_name = "reactive_raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_B, AD7758_REACT_PWR),
> + .scan_index = 9,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + }, {
> + .type = IIO_VOLTAGE,
> + .indexed = 1,
> + .channel = 2,
> + .extend_name = "raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_C, AD7758_VOLTAGE),
> + .scan_index = 10,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + }, {
> + .type = IIO_CURRENT,
> + .indexed = 1,
> + .channel = 2,
> + .extend_name = "raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_C, AD7758_CURRENT),
> + .scan_index = 11,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + }, {
> + .type = IIO_POWER,
> + .indexed = 1,
> + .channel = 2,
> + .extend_name = "apparent_raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_C, AD7758_APP_PWR),
> + .scan_index = 12,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + }, {
> + .type = IIO_POWER,
> + .indexed = 1,
> + .channel = 2,
> + .extend_name = "active_raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_C, AD7758_ACT_PWR),
> + .scan_index = 13,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + }, {
> + .type = IIO_POWER,
> + .indexed = 1,
> + .channel = 2,
> + .extend_name = "reactive_raw",
> + .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
> + .address = AD7758_WT(AD7758_PHASE_C, AD7758_REACT_PWR),
> + .scan_index = 14,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 24,
> + .storagebits = 32,
> + },
> + },
> IIO_CHAN_SOFT_TIMESTAMP(15),
> };
>
next prev parent reply other threads:[~2012-04-11 11:47 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-10 20:21 [PATCH 00/14] IIO: Kill off IIO_CHAN macro Jonathan Cameron
2012-04-10 20:21 ` [PATCH 01/14] staging:iio:accel:adis16201 unwind use of " Jonathan Cameron
2012-04-11 11:39 ` Lars-Peter Clausen
2012-04-10 20:21 ` [PATCH 02/14] staging:iio:accel:adis16203 " Jonathan Cameron
2012-04-11 11:39 ` Lars-Peter Clausen
2012-04-10 20:21 ` [PATCH 03/14] staging:iio:accel:adis16204 " Jonathan Cameron
2012-04-11 11:40 ` Lars-Peter Clausen
2012-04-10 20:21 ` [PATCH 04/14] staging:iio:accel:adis16209 " Jonathan Cameron
2012-04-11 11:42 ` Lars-Peter Clausen
2012-04-10 20:21 ` [PATCH 05/14] staging:iio:accel:adis16240 " Jonathan Cameron
2012-04-11 11:25 ` Lars-Peter Clausen
2012-04-11 17:46 ` [PATCH V2] " Jonathan Cameron
2012-04-13 8:26 ` Lars-Peter Clausen
2012-04-13 8:26 ` Lars-Peter Clausen
2012-04-10 20:21 ` [PATCH 06/14] staging:iio:accel:lis3l02dq " Jonathan Cameron
2012-04-10 20:21 ` [PATCH 07/14] staging:iio:accel:sca3000 " Jonathan Cameron
2012-04-10 20:21 ` [PATCH 08/14] staging:iio:adc:ad7298 " Jonathan Cameron
2012-04-11 11:44 ` Lars-Peter Clausen
2012-04-10 20:21 ` [PATCH 09/14] staging:iio:adc:ad7476 " Jonathan Cameron
2012-04-11 9:47 ` Lars-Peter Clausen
2012-04-11 17:41 ` [PATCH V2] " Jonathan Cameron
2012-04-13 8:22 ` Lars-Peter Clausen
2012-04-10 20:21 ` [PATCH 10/14] staging:iio:accel:ad7780 " Jonathan Cameron
2012-04-11 11:49 ` Lars-Peter Clausen
2012-04-10 20:21 ` [PATCH 11/14] staging:iio:gyro:adis16260 " Jonathan Cameron
2012-04-11 11:52 ` Lars-Peter Clausen
2012-04-10 20:21 ` [PATCH 12/14] staging:iio:impedance-analyzer:ad5933 " Jonathan Cameron
2012-04-11 11:46 ` Lars-Peter Clausen
2012-04-10 20:21 ` [PATCH 13/14] staging:iio:meter:ade7758 " Jonathan Cameron
2012-04-11 11:47 ` Lars-Peter Clausen [this message]
2012-04-10 20:21 ` [PATCH 14/14] staging:iio:core drop the IIO_CHAN macro for ease of maintenance Jonathan Cameron
2012-04-11 11:21 ` [PATCH 00/14] IIO: Kill off IIO_CHAN macro Lars-Peter Clausen
2012-04-11 11:20 ` Jonathan Cameron
2012-04-11 11:55 ` Lars-Peter Clausen
2012-04-11 11:53 ` Jonathan Cameron
-- strict thread matches above, loose matches on Subject: below --
2012-04-13 9:42 [PATCH 00/14 V2] " Jonathan Cameron
2012-04-13 9:42 ` [PATCH 13/14] staging:iio:meter:ade7758 unwind use of " 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=4F856F43.9030302@metafoo.de \
--to=lars@metafoo.de \
--cc=device-drivers-devel@blackfin.uclinux.org \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
/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.