On Sat, 18 May 2019 19:41:36 -0300
Bárbara Fernandes <barbara.fernandes@xxxxxx> wrote:
> Create macro for capacitance channels in order to remove the repeated
> code and improve its readability.
>
> Signed-off-by: Bárbara Fernandes <barbara.fernandes@xxxxxx>
> Signed-off-by: Wilson Sales <spoonm@xxxxxxxxxx>
> Co-developed-by: Wilson Sales <spoonm@xxxxxxxxxx>
Not a totally clear cut case given there are only two instances, but
I think, on balance that it is an improvement.
As this isn't really connected to patch 1 in the series (or the fix
going via the other tree) I'll apply this one now. Please only
send a new version of patch 1.
Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders (0-day etc) to see if they can find anything
we have missed.
Some time after those test results have come in, I'll push the tree
out as togreg, and in a few weeks send a pull request to Greg to
hopefully have it pulled into his tree which is part of Linux next
and from which he will then send a pull request to Linus in the
next merge window.
Thanks,
Jonathan
> ---
> drivers/staging/iio/cdc/ad7150.c | 29 ++++++++++++-----------------
> 1 file changed, 12 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c
> index 072094227e1b..d8c43cabce25 100644
> --- a/drivers/staging/iio/cdc/ad7150.c
> +++ b/drivers/staging/iio/cdc/ad7150.c
> @@ -468,24 +468,19 @@ static const struct iio_event_spec ad7150_events[] = {
> },
> };
>
> +#define AD7150_CAPACITANCE_CHAN(_chan) { \
> + .type = IIO_CAPACITANCE, \
> + .indexed = 1, \
> + .channel = _chan, \
> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
> + BIT(IIO_CHAN_INFO_AVERAGE_RAW), \
> + .event_spec = ad7150_events, \
> + .num_event_specs = ARRAY_SIZE(ad7150_events), \
> + }
> +
> static const struct iio_chan_spec ad7150_channels[] = {
> - {
> - .type = IIO_CAPACITANCE,
> - .indexed = 1,
> - .channel = 0,
> - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
> - BIT(IIO_CHAN_INFO_AVERAGE_RAW),
> - .event_spec = ad7150_events,
> - .num_event_specs = ARRAY_SIZE(ad7150_events),
> - }, {
> - .type = IIO_CAPACITANCE,
> - .indexed = 1,
> - .channel = 1,
> - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
> - BIT(IIO_CHAN_INFO_AVERAGE_RAW),
> - .event_spec = ad7150_events,
> - .num_event_specs = ARRAY_SIZE(ad7150_events),
> - },
> + AD7150_CAPACITANCE_CHAN(0),
> + AD7150_CAPACITANCE_CHAN(1)
> };
>
> /*
