Linux-IIO Archive on lore.kernel.org
 help / color / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org
Cc: alexandru.Ardelean@analog.com,
	Andy Shevchenko <andy.shevchenko@gmail.com>,
	Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: [PATCH 05/23] iio:adc:max1363: Drop of_match_ptr and use generic device_get_match_data
Date: Sun, 28 Jun 2020 13:36:36 +0100
Message-ID: <20200628123654.32830-6-jic23@kernel.org> (raw)
In-Reply-To: <20200628123654.32830-1-jic23@kernel.org>

From: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Allows driver to use ACPI PRP0001 binding and there was no particular
advantage in having the protections in this driver.

Mostly this part of an effort to remove as many OF specific bits
of handling from IIO and use the generic forms where possible.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
 drivers/iio/adc/max1363.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
index d8da5da74b77..420e2ec154fc 100644
--- a/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@ -22,8 +22,8 @@
 #include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
+#include <linux/mod_devicetable.h>
+#include <linux/property.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
@@ -1529,8 +1529,6 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p)
 	return IRQ_HANDLED;
 }
 
-#ifdef CONFIG_OF
-
 #define MAX1363_COMPATIBLE(of_compatible, cfg) {		\
 			.compatible = of_compatible,		\
 			.data = &max1363_chip_info_tbl[cfg],	\
@@ -1578,7 +1576,6 @@ static const struct of_device_id max1363_of_match[] = {
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, max1363_of_match);
-#endif
 
 static int max1363_probe(struct i2c_client *client,
 			 const struct i2c_device_id *id)
@@ -1613,7 +1610,7 @@ static int max1363_probe(struct i2c_client *client,
 	/* this is only used for device removal purposes */
 	i2c_set_clientdata(client, indio_dev);
 
-	st->chip_info = of_device_get_match_data(&client->dev);
+	st->chip_info = device_get_match_data(&client->dev);
 	if (!st->chip_info)
 		st->chip_info = &max1363_chip_info_tbl[id->driver_data];
 	st->client = client;
@@ -1756,7 +1753,7 @@ MODULE_DEVICE_TABLE(i2c, max1363_id);
 static struct i2c_driver max1363_driver = {
 	.driver = {
 		.name = "max1363",
-		.of_match_table = of_match_ptr(max1363_of_match),
+		.of_match_table = max1363_of_match,
 	},
 	.probe = max1363_probe,
 	.remove = max1363_remove,
-- 
2.27.0


  parent reply index

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-28 12:36 [PATCH 00/23] iio:adc more of_match_ptr and similar removal Jonathan Cameron
2020-06-28 12:36 ` [PATCH 01/23] iio:adc:lpc32xx: Drop of_match_ptr protection Jonathan Cameron
2020-06-30  7:01   ` Andy Shevchenko
2020-07-04 16:49     ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 02/23] iio:adc:axp20x: Convert from OF to generic fw / device properties Jonathan Cameron
2020-06-28 17:43   ` Andy Shevchenko
2020-06-28 19:16     ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 03/23] iio:adc:hi8435: Drop unused of_gpio.h header Jonathan Cameron
2020-07-04 16:52   ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 04/23] iio:adc:hi8435: Drop of_match_ptr protection Jonathan Cameron
2020-07-04 16:53   ` Jonathan Cameron
2020-06-28 12:36 ` Jonathan Cameron [this message]
2020-07-04 16:54   ` [PATCH 05/23] iio:adc:max1363: Drop of_match_ptr and use generic device_get_match_data Jonathan Cameron
2020-06-28 12:36 ` [PATCH 06/23] iio:adc:max1027: drop of_match_ptr and CONFIG_OF protections Jonathan Cameron
2020-07-04 16:56   ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 07/23] iio:adc:ltc2496: Drop of_match_ptr and use mod_devicetable.h Jonathan Cameron
2020-06-28 15:52   ` Uwe Kleine-König
2020-07-04 16:58     ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 08/23] iio:adc:cpcap-adc: Drop of_match_ptr protection and use device_get_match_data Jonathan Cameron
2020-06-29 15:21   ` Tony Lindgren
2020-07-04 17:00     ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 09/23] iio:adc:ltc2497 drop of_match_ptr protection Jonathan Cameron
2020-06-28 15:53   ` Uwe Kleine-König
2020-07-04 17:04     ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 10/23] iio:adc:max11100: Drop of_match_ptr protection / add mod_devicetable.h include Jonathan Cameron
2020-06-29  7:28   ` Jacopo Mondi
2020-07-04 17:19     ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 11/23] iio:adc:max1118: Drop CONFIG_OF / of_match_ptr protections Jonathan Cameron
2020-07-04 17:20   ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 12/23] iio:adc:mcp320x: Drop CONFIG_OF and " Jonathan Cameron
2020-07-04 17:21   ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 13/23] iio:adc:mcp3422: remove " Jonathan Cameron
2020-07-04 17:22   ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 14/23] iio:adc:sd_adc_modulator: Drop of_match_ptr and tweak includes Jonathan Cameron
2020-07-04 17:24   ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 15/23] iio:adc:ti-adc081c: Drop of_match_ptr and change to mod_devicetable.h Jonathan Cameron
2020-06-30  7:12   ` Andy Shevchenko
2020-07-04 15:45     ` Jonathan Cameron
2020-07-04 17:26       ` Jonathan Cameron
2020-07-04 18:31         ` Andy Shevchenko
2020-06-28 12:36 ` [PATCH 16/23] iio:adc:ti-adc0832: drop CONFIG_OF and of_match_ptr protections Jonathan Cameron
2020-07-04 17:29   ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 17/23] iio:adc:ti-adc084s021: drop of_match_ptr protection Jonathan Cameron
2020-07-04 17:30   ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 18/23] iio:adc:ti-adc108s102: Drop CONFIG_OF and of_match_ptr protections Jonathan Cameron
2020-06-30  7:20   ` Andy Shevchenko
2020-07-04 15:54     ` Jonathan Cameron
2020-07-04 18:16       ` Andy Shevchenko
2020-06-28 12:36 ` [PATCH 19/23] iio:adc:ti-adc128s052: drop of_match_ptr protection Jonathan Cameron
2020-06-30  7:22   ` Andy Shevchenko
2020-07-04 15:58     ` Jonathan Cameron
2020-07-04 18:20       ` Andy Shevchenko
2020-06-28 12:36 ` [PATCH 20/23] iio:adc:ti-adc161s626: Drop " Jonathan Cameron
2020-06-28 19:51   ` Matt Ranostay
2020-07-04 17:31     ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 21/23] iio:adc:ti-tlc4541: Drop CONFIG_OF and of_match_ptr protections Jonathan Cameron
2020-06-28 23:43   ` Phil Reid
2020-07-04 17:32     ` Jonathan Cameron
2020-06-28 12:36 ` [PATCH 22/23] iio:adc:bcm_iproc: Drop of_match_ptr protection and switch to mod_devicetable.h Jonathan Cameron
2020-06-30  7:25   ` Andy Shevchenko
2020-07-04 15:59     ` Jonathan Cameron
2020-07-04 18:22       ` Andy Shevchenko
2020-06-28 12:36 ` [PATCH 23/23] iio:adc:ingenic: drop of_match_ptr protection and include mod_devicetable.h Jonathan Cameron
2020-07-04 17:33   ` Jonathan Cameron
2020-06-28 17:53 ` [PATCH 00/23] iio:adc more of_match_ptr and similar removal Andy Shevchenko
2020-06-28 19:32   ` Jonathan Cameron
2020-06-30  7:27 ` Andy Shevchenko
2020-07-04 17:35   ` 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=20200628123654.32830-6-jic23@kernel.org \
    --to=jic23@kernel.org \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=alexandru.Ardelean@analog.com \
    --cc=andy.shevchenko@gmail.com \
    --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

Linux-IIO Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-iio/0 linux-iio/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-iio linux-iio/ https://lore.kernel.org/linux-iio \
		linux-iio@vger.kernel.org
	public-inbox-index linux-iio

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-iio


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git