From: Jonathan Cameron <jic23@kernel.org>
To: Stefan Popa <stefan.popa@analog.com>
Cc: <robh+dt@kernel.org>, <mark.rutland@arm.com>,
<Michael.Hennerich@analog.com>, <knaack.h@gmx.de>,
<lars@metafoo.de>, <pmeerw@pmeerw.net>,
<gregkh@linuxfoundation.org>, <linux-kernel@vger.kernel.org>,
<linux-iio@vger.kernel.org>, <devel@driverdev.osuosl.org>
Subject: Re: [PATCH v2 4/6] staging: iio: adc: ad7606: Misc style fixes (no functional change)
Date: Sat, 22 Dec 2018 17:50:10 +0000 [thread overview]
Message-ID: <20181222175010.548516be@archlinux> (raw)
In-Reply-To: <1545049420-16484-5-git-send-email-stefan.popa@analog.com>
On Mon, 17 Dec 2018 14:23:38 +0200
Stefan Popa <stefan.popa@analog.com> wrote:
> * Placed includes in alphabetical order
> * Added brackets around num and mask through out for AD760X_CHANNEL
> * Used single line comments where needed
> * Removed extra lines and spaces
>
> Signed-off-by: Stefan Popa <stefan.popa@analog.com>
Applied.
Thanks,
Jonathan
> ---
> drivers/staging/iio/adc/ad7606.c | 27 ++++++++++++---------------
> drivers/staging/iio/adc/ad7606.h | 1 -
> drivers/staging/iio/adc/ad7606_par.c | 27 ++++++++-------------------
> drivers/staging/iio/adc/ad7606_spi.c | 16 ++++++++--------
> 4 files changed, 28 insertions(+), 43 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/ad7606.c b/drivers/staging/iio/adc/ad7606.c
> index 5f0712c..32854f1 100644
> --- a/drivers/staging/iio/adc/ad7606.c
> +++ b/drivers/staging/iio/adc/ad7606.c
> @@ -5,25 +5,25 @@
> * Copyright 2011 Analog Devices Inc.
> */
>
> -#include <linux/interrupt.h>
> +#include <linux/delay.h>
> #include <linux/device.h>
> -#include <linux/kernel.h>
> -#include <linux/slab.h>
> -#include <linux/sysfs.h>
> -#include <linux/regulator/consumer.h>
> #include <linux/err.h>
> #include <linux/gpio/consumer.h>
> -#include <linux/delay.h>
> -#include <linux/sched.h>
> +#include <linux/interrupt.h>
> +#include <linux/kernel.h>
> #include <linux/module.h>
> +#include <linux/regulator/consumer.h>
> +#include <linux/sched.h>
> +#include <linux/slab.h>
> +#include <linux/sysfs.h>
> #include <linux/util_macros.h>
>
> #include <linux/iio/iio.h>
> -#include <linux/iio/sysfs.h>
> #include <linux/iio/buffer.h>
> -#include <linux/iio/trigger_consumer.h>
> +#include <linux/iio/sysfs.h>
> #include <linux/iio/trigger.h>
> #include <linux/iio/triggered_buffer.h>
> +#include <linux/iio/trigger_consumer.h>
>
> #include "ad7606.h"
>
> @@ -249,8 +249,7 @@ static const struct attribute_group ad7606_attribute_group_range = {
> .attrs = ad7606_attributes_range,
> };
>
> -#define AD760X_CHANNEL(num, mask) \
> - { \
> +#define AD760X_CHANNEL(num, mask) { \
> .type = IIO_VOLTAGE, \
> .indexed = 1, \
> .channel = num, \
> @@ -265,7 +264,7 @@ static const struct attribute_group ad7606_attribute_group_range = {
> .storagebits = 16, \
> .endianness = IIO_CPU, \
> }, \
> - }
> +}
>
> #define AD7605_CHANNEL(num) \
> AD760X_CHANNEL(num, 0)
> @@ -294,9 +293,7 @@ static const struct iio_chan_spec ad7606_channels[] = {
> };
>
> static const struct ad7606_chip_info ad7606_chip_info_tbl[] = {
> - /*
> - * More devices added in future
> - */
> + /* More devices added in future */
> [ID_AD7605_4] = {
> .channels = ad7605_channels,
> .num_channels = 5,
> diff --git a/drivers/staging/iio/adc/ad7606.h b/drivers/staging/iio/adc/ad7606.h
> index 9a832d2..5d12410 100644
> --- a/drivers/staging/iio/adc/ad7606.h
> +++ b/drivers/staging/iio/adc/ad7606.h
> @@ -14,7 +14,6 @@
> * @num_channels: number of channels
> * @has_oversampling: whether the device has oversampling support
> */
> -
> struct ad7606_chip_info {
> const struct iio_chan_spec *channels;
> unsigned int num_channels;
> diff --git a/drivers/staging/iio/adc/ad7606_par.c b/drivers/staging/iio/adc/ad7606_par.c
> index 2d137b1..df607c7 100644
> --- a/drivers/staging/iio/adc/ad7606_par.c
> +++ b/drivers/staging/iio/adc/ad7606_par.c
> @@ -26,7 +26,7 @@ static int ad7606_par16_read_block(struct device *dev,
> }
>
> static const struct ad7606_bus_ops ad7606_par16_bops = {
> - .read_block = ad7606_par16_read_block,
> + .read_block = ad7606_par16_read_block,
> };
>
> static int ad7606_par8_read_block(struct device *dev,
> @@ -41,7 +41,7 @@ static int ad7606_par8_read_block(struct device *dev,
> }
>
> static const struct ad7606_bus_ops ad7606_par8_bops = {
> - .read_block = ad7606_par8_read_block,
> + .read_block = ad7606_par8_read_block,
> };
>
> static int ad7606_par_probe(struct platform_device *pdev)
> @@ -72,22 +72,12 @@ static int ad7606_par_probe(struct platform_device *pdev)
> }
>
> static const struct platform_device_id ad7606_driver_ids[] = {
> - {
> - .name = "ad7605-4",
> - .driver_data = ID_AD7605_4,
> - }, {
> - .name = "ad7606-8",
> - .driver_data = ID_AD7606_8,
> - }, {
> - .name = "ad7606-6",
> - .driver_data = ID_AD7606_6,
> - }, {
> - .name = "ad7606-4",
> - .driver_data = ID_AD7606_4,
> - },
> + { .name = "ad7605-4", .driver_data = ID_AD7605_4, },
> + { .name = "ad7606-4", .driver_data = ID_AD7606_4, },
> + { .name = "ad7606-6", .driver_data = ID_AD7606_6, },
> + { .name = "ad7606-8", .driver_data = ID_AD7606_8, },
> { }
> };
> -
> MODULE_DEVICE_TABLE(platform, ad7606_driver_ids);
>
> static const struct of_device_id ad7606_of_match[] = {
> @@ -103,12 +93,11 @@ static struct platform_driver ad7606_driver = {
> .probe = ad7606_par_probe,
> .id_table = ad7606_driver_ids,
> .driver = {
> - .name = "ad7606",
> - .pm = AD7606_PM_OPS,
> + .name = "ad7606",
> + .pm = AD7606_PM_OPS,
> .of_match_table = ad7606_of_match,
> },
> };
> -
> module_platform_driver(ad7606_driver);
>
> MODULE_AUTHOR("Michael Hennerich <michael.hennerich@analog.com>");
> diff --git a/drivers/staging/iio/adc/ad7606_spi.c b/drivers/staging/iio/adc/ad7606_spi.c
> index f38f0d6..f842eba 100644
> --- a/drivers/staging/iio/adc/ad7606_spi.c
> +++ b/drivers/staging/iio/adc/ad7606_spi.c
> @@ -36,7 +36,7 @@ static int ad7606_spi_read_block(struct device *dev,
> }
>
> static const struct ad7606_bus_ops ad7606_spi_bops = {
> - .read_block = ad7606_spi_read_block,
> + .read_block = ad7606_spi_read_block,
> };
>
> static int ad7606_spi_probe(struct spi_device *spi)
> @@ -48,14 +48,14 @@ static int ad7606_spi_probe(struct spi_device *spi)
> &ad7606_spi_bops);
> }
>
> -static const struct spi_device_id ad7606_id[] = {
> - {"ad7605-4", ID_AD7605_4},
> - {"ad7606-8", ID_AD7606_8},
> - {"ad7606-6", ID_AD7606_6},
> - {"ad7606-4", ID_AD7606_4},
> +static const struct spi_device_id ad7606_id_table[] = {
> + { "ad7605-4", ID_AD7605_4 },
> + { "ad7606-4", ID_AD7606_4 },
> + { "ad7606-6", ID_AD7606_6 },
> + { "ad7606-8", ID_AD7606_8 },
> {}
> };
> -MODULE_DEVICE_TABLE(spi, ad7606_id);
> +MODULE_DEVICE_TABLE(spi, ad7606_id_table);
>
> static const struct of_device_id ad7606_of_match[] = {
> { .compatible = "adi,ad7605-4" },
> @@ -73,7 +73,7 @@ static struct spi_driver ad7606_driver = {
> .pm = AD7606_PM_OPS,
> },
> .probe = ad7606_spi_probe,
> - .id_table = ad7606_id,
> + .id_table = ad7606_id_table,
> };
> module_spi_driver(ad7606_driver);
>
next prev parent reply other threads:[~2018-12-22 17:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-17 12:23 [PATCH v2 0/6] staging: iio: ad7606: Move out of staging Stefan Popa
2018-12-17 12:23 ` [PATCH v2 1/6] staging: iio: adc: ad7606: Simplify the Kconfing menu Stefan Popa
2018-12-22 17:40 ` Jonathan Cameron
2018-12-17 12:23 ` [PATCH v2 2/6] staging: iio: adc: ad7606: Use SPDX identifier Stefan Popa
2018-12-22 17:47 ` Jonathan Cameron
2018-12-17 12:23 ` [PATCH v2 3/6] staging: iio: adc: ad7606: Add support for threaded irq Stefan Popa
2018-12-22 17:49 ` Jonathan Cameron
2018-12-17 12:23 ` [PATCH v2 4/6] staging: iio: adc: ad7606: Misc style fixes (no functional change) Stefan Popa
2018-12-22 17:50 ` Jonathan Cameron [this message]
2018-12-17 12:23 ` [PATCH v2 5/6] staging: iio: adc: ad7606: Move out of staging Stefan Popa
2018-12-22 17:56 ` Jonathan Cameron
2018-12-17 12:23 ` [PATCH v2 6/6] dt-bindings: iio: adc: Add docs for AD7606 ADC Stefan Popa
2018-12-22 17:58 ` 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=20181222175010.548516be@archlinux \
--to=jic23@kernel.org \
--cc=Michael.Hennerich@analog.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pmeerw@pmeerw.net \
--cc=robh+dt@kernel.org \
--cc=stefan.popa@analog.com \
/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.