From: Jonathan Cameron <jic23@kernel.org>
To: Alexandru Tachici <alexandru.tachici@analog.com>
Cc: <linux-iio@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 3/5] staging: iio: adc: ad7192: removed spi_device_id
Date: Fri, 14 Feb 2020 15:48:46 +0000 [thread overview]
Message-ID: <20200214154846.7daf946c@archlinux> (raw)
In-Reply-To: <20200212161721.16200-4-alexandru.tachici@analog.com>
On Wed, 12 Feb 2020 18:17:19 +0200
Alexandru Tachici <alexandru.tachici@analog.com> wrote:
> This patch removes spi_device_id table and moves the
> init data (id of the chip) in the .data field
> of of_device_id table.
>
> Signed-off-by: Alexandru Tachici <alexandru.tachici@analog.com>
Applied
Thanks,
Jonathan
> ---
> drivers/staging/iio/adc/ad7192.c | 33 +++++++++++---------------------
> 1 file changed, 11 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
> index 8fca8915543d..8ec28aa8fa8a 100644
> --- a/drivers/staging/iio/adc/ad7192.c
> +++ b/drivers/staging/iio/adc/ad7192.c
> @@ -16,6 +16,7 @@
> #include <linux/err.h>
> #include <linux/sched.h>
> #include <linux/delay.h>
> +#include <linux/of_device.h>
>
> #include <linux/iio/iio.h>
> #include <linux/iio/sysfs.h>
> @@ -876,6 +877,15 @@ static int ad7192_channels_config(struct iio_dev *indio_dev)
> return 0;
> }
>
> +static const struct of_device_id ad7192_of_match[] = {
> + { .compatible = "adi,ad7190", .data = (void *)ID_AD7190 },
> + { .compatible = "adi,ad7192", .data = (void *)ID_AD7192 },
> + { .compatible = "adi,ad7193", .data = (void *)ID_AD7193 },
> + { .compatible = "adi,ad7195", .data = (void *)ID_AD7195 },
> + {}
> +};
> +MODULE_DEVICE_TABLE(of, ad7192_of_match);
> +
> static int ad7192_probe(struct spi_device *spi)
> {
> struct ad7192_state *st;
> @@ -928,7 +938,7 @@ static int ad7192_probe(struct spi_device *spi)
> }
>
> spi_set_drvdata(spi, indio_dev);
> - st->devid = spi_get_device_id(spi)->driver_data;
> + st->devid = (unsigned long)of_device_get_match_data(&spi->dev);
> indio_dev->dev.parent = &spi->dev;
> indio_dev->name = spi_get_device_id(spi)->name;
> indio_dev->modes = INDIO_DIRECT_MODE;
> @@ -1009,26 +1019,6 @@ static int ad7192_remove(struct spi_device *spi)
> return 0;
> }
>
> -static const struct spi_device_id ad7192_id[] = {
> - {"ad7190", ID_AD7190},
> - {"ad7192", ID_AD7192},
> - {"ad7193", ID_AD7193},
> - {"ad7195", ID_AD7195},
> - {}
> -};
> -
> -MODULE_DEVICE_TABLE(spi, ad7192_id);
> -
> -static const struct of_device_id ad7192_of_match[] = {
> - { .compatible = "adi,ad7190" },
> - { .compatible = "adi,ad7192" },
> - { .compatible = "adi,ad7193" },
> - { .compatible = "adi,ad7195" },
> - {}
> -};
> -
> -MODULE_DEVICE_TABLE(of, ad7192_of_match);
> -
> static struct spi_driver ad7192_driver = {
> .driver = {
> .name = "ad7192",
> @@ -1036,7 +1026,6 @@ static struct spi_driver ad7192_driver = {
> },
> .probe = ad7192_probe,
> .remove = ad7192_remove,
> - .id_table = ad7192_id,
> };
> module_spi_driver(ad7192_driver);
>
next prev parent reply other threads:[~2020-02-14 15:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 16:17 [PATCH v3 0/5] iio: adc: ad7192: move out of staging Alexandru Tachici
2020-02-12 16:17 ` [PATCH v3 1/5] staging: iio: adc: ad7192: fail probe on get_voltage Alexandru Tachici
2020-02-14 15:40 ` Jonathan Cameron
2020-02-12 16:17 ` [PATCH v3 2/5] staging: iio: adc: ad7192: modify iio_chan_spec array Alexandru Tachici
2020-02-14 15:47 ` Jonathan Cameron
2020-02-12 16:17 ` [PATCH 3/5] staging: iio: adc: ad7192: removed spi_device_id Alexandru Tachici
2020-02-14 15:48 ` Jonathan Cameron [this message]
2020-02-12 16:17 ` [PATCH v3 4/5] Documentation: ABI: testing: ad7192: update sysfs docs Alexandru Tachici
2020-02-14 15:49 ` Jonathan Cameron
2020-02-12 16:17 ` [PATCH v3 5/5] staging: iio: adc: ad7192: move out of staging Alexandru Tachici
2020-02-14 15:50 ` 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=20200214154846.7daf946c@archlinux \
--to=jic23@kernel.org \
--cc=alexandru.tachici@analog.com \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).