Linux-IIO Archive on lore.kernel.org
 help / color / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
	Jonathan Cameron <Jonathan.Cameron@huawei.com>,
	Matt Ranostay <matt.ranostay@konsulko.com>
Subject: [PATCH 32/38] iio:proximity:as3935: Drop of_match_ptr and use generic fw accessors
Date: Thu, 10 Sep 2020 18:32:36 +0100
Message-ID: <20200910173242.621168-33-jic23@kernel.org> (raw)
In-Reply-To: <20200910173242.621168-1-jic23@kernel.org>

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

This change allows the driver to be used with ACPI PRP0001 and removes
an antipattern that I want to avoid being copied into new IIO drivers.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Matt Ranostay <matt.ranostay@konsulko.com>
---
 drivers/iio/proximity/as3935.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
index 4df8d53d65fb..b79ada839e01 100644
--- a/drivers/iio/proximity/as3935.c
+++ b/drivers/iio/proximity/as3935.c
@@ -7,6 +7,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/mod_devicetable.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
@@ -356,7 +357,6 @@ static int as3935_probe(struct spi_device *spi)
 	struct iio_dev *indio_dev;
 	struct iio_trigger *trig;
 	struct as3935_state *st;
-	struct device_node *np = dev->of_node;
 	int ret;
 
 	/* Be sure lightning event interrupt is specified */
@@ -375,7 +375,7 @@ static int as3935_probe(struct spi_device *spi)
 	spi_set_drvdata(spi, indio_dev);
 	mutex_init(&st->lock);
 
-	ret = of_property_read_u32(np,
+	ret = device_property_read_u32(dev,
 			"ams,tuning-capacitor-pf", &st->tune_cap);
 	if (ret) {
 		st->tune_cap = 0;
@@ -389,7 +389,7 @@ static int as3935_probe(struct spi_device *spi)
 		return -EINVAL;
 	}
 
-	ret = of_property_read_u32(np,
+	ret = device_property_read_u32(dev,
 			"ams,nflwdth", &st->nflwdth_reg);
 	if (!ret && st->nflwdth_reg > AS3935_NFLWDTH_MASK) {
 		dev_err(dev, "invalid nflwdth setting of %d\n",
@@ -471,7 +471,7 @@ MODULE_DEVICE_TABLE(spi, as3935_id);
 static struct spi_driver as3935_driver = {
 	.driver = {
 		.name	= "as3935",
-		.of_match_table = of_match_ptr(as3935_of_match),
+		.of_match_table = as3935_of_match,
 		.pm	= AS3935_PM_OPS,
 	},
 	.probe		= as3935_probe,
-- 
2.28.0


  parent reply index

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-10 17:32 [PATCH 00/38] iio: remaining easy of_match_ptr removal and related Jonathan Cameron
2020-09-10 17:32 ` [PATCH 01/38] iio:potentiometer:ad5272: Drop of_match_ptr and CONFIG_OF protections Jonathan Cameron
2020-09-10 17:32 ` [PATCH 02/38] iio:potentiometer:ds1803: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 03/38] iio:potentiometer:max5432: Drop of_match_ptr and use generic fw accessors Jonathan Cameron
2020-09-21 14:24   ` Martin Kaiser
2020-09-10 17:32 ` [PATCH 04/38] iio:potentiometer:max5481: Drop of_match_ptr and CONFIG_OF protections Jonathan Cameron
2020-09-10 17:32 ` [PATCH 05/38] iio:potentiometer:max5481: Drop invalid ACPI binding Jonathan Cameron
2020-09-14  8:07   ` Andy Shevchenko
2020-09-10 17:32 ` [PATCH 06/38] iio:potentiometer:mcp4018: Drop of_match_ptr and CONFIG_OF protections Jonathan Cameron
2020-09-10 17:32 ` [PATCH 07/38] iio:potentiometer:mcp4131: Drop of_match_ptr and use generic fw interfaces Jonathan Cameron
2020-09-10 17:32 ` [PATCH 08/38] iio:potentiometer:mcp4531: Drop of_match_ptr and CONFIG_OF protections Jonathan Cameron
2020-09-10 17:32 ` [PATCH 09/38] iio:dac:ad5446: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 10/38] iio:dac:ad5592r: Drop of_match_ptr and ACPI_PTR protections Jonathan Cameron
2020-09-10 17:32 ` [PATCH 11/38] iio:dac:ad5593r: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 12/38] iio:dac:ad7303: Drop of_match_ptr protection Jonathan Cameron
2020-09-10 17:32 ` [PATCH 13/38] iio:dac:mcp4725: drop of_match_ptr and use generic fw properties Jonathan Cameron
2020-09-10 17:32 ` [PATCH 14/38] iio:dac:ti-dac082s085: Drop of_match_ptr and CONFIG_OF protections Jonathan Cameron
2020-09-10 17:32 ` [PATCH 15/38] iio:dac:ti-dac5571: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 16/38] iio:potentiostat:lmp91000: Drop of_match_ptr and use generic fw accessors Jonathan Cameron
2020-09-15 18:59   ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 17/38] iio:pressure:icp10100: Drop of_match_ptr and CONFIG_OF protections Jonathan Cameron
2020-09-10 17:32 ` [PATCH 18/38] iio:pressure:ms5611: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 19/38] iio:pressure:ms5637: Drop of_match_ptr protection Jonathan Cameron
2020-09-10 17:32 ` [PATCH 20/38] iio:pressure:zpa2326: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 21/38] iio:temperature:tsys01: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 22/38] iio:temperature:tmp007: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 23/38] iio:resolver:ad2s1200: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 24/38] iio:chemical:ams-iaq-core: " Jonathan Cameron
2020-09-15 18:55   ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 25/38] iio:chemical:atlas-sensor: Drop of_match_ptr and use generic fw accessors Jonathan Cameron
2020-09-15 18:59   ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 26/38] iio:chemical:sgp30: Use local variable dev to simplify code Jonathan Cameron
2020-09-10 17:32 ` [PATCH 27/38] iio:chemical:sgp30: Drop of_match_ptr and use generic fw accessors Jonathan Cameron
2020-09-10 17:32 ` [PATCH 28/38] iio:chemical:vz89x: Introduce local struct device pointer Jonathan Cameron
2020-09-15 19:02   ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 29/38] iio:chemical:vz89x: Drop of_match_ptr protection and use generic fw accessors Jonathan Cameron
2020-09-15 19:03   ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 30/38] iio:humidity:hdc100x: Drop of_match_ptr protection Jonathan Cameron
2020-09-15 18:59   ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 31/38] iio:proximity:as3935: Use local struct device pointer to simplify code Jonathan Cameron
2020-09-15 18:56   ` Matt Ranostay
2020-09-10 17:32 ` Jonathan Cameron [this message]
2020-09-15 18:55   ` [PATCH 32/38] iio:proximity:as3935: Drop of_match_ptr and use generic fw accessors Matt Ranostay
2020-09-10 17:32 ` [PATCH 33/38] iio:proximity:pulsedlight: Drop of_match_ptr protection Jonathan Cameron
2020-09-15 18:55   ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 34/38] iio:magn:ak8975: Drop of_match_ptr and ACPI_PTR protections Jonathan Cameron
2020-09-11 18:59   ` Jonathan Albrieux
2020-09-10 17:32 ` [PATCH 35/38] iio:magn:ak8974: Drop of_match_ptr protection Jonathan Cameron
2020-09-29 12:40   ` Linus Walleij
2020-09-10 17:32 ` [PATCH 36/38] iio:humidity:htu21: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 37/38] iio:humidity:si7020: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 38/38] iio:health:max30102: Drop of_match_ptr and use generic fw accessors Jonathan Cameron
2020-09-15 18:54   ` Matt Ranostay
2020-09-14  8:04 ` [PATCH 00/38] iio: remaining easy of_match_ptr removal and related Andy Shevchenko
2020-09-17 18:17   ` 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=20200910173242.621168-33-jic23@kernel.org \
    --to=jic23@kernel.org \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=andy.shevchenko@gmail.com \
    --cc=linux-iio@vger.kernel.org \
    --cc=matt.ranostay@konsulko.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

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