diff mbox series

[04/23] iio:adc:hi8435: Drop of_match_ptr protection.

Message ID 20200628123654.32830-5-jic23@kernel.org (mailing list archive)
State New, archived
Headers show
Series iio:adc more of_match_ptr and similar removal | expand

Commit Message

Jonathan Cameron June 28, 2020, 12:36 p.m. UTC 
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Allows use of ACPI with PRP0001 and is generally something we are
trying to avoid having people cut and paste into new drivers without
thinking about it.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Cc: Nikita Yushchenko <nikita.yoush@cogentembedded.com>
---
 drivers/iio/adc/hi8435.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Jonathan Cameron July 4, 2020, 4:53 p.m. UTC | #1 
On Sun, 28 Jun 2020 13:36:35 +0100
Jonathan Cameron <jic23@kernel.org> wrote:

> From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> 
> Allows use of ACPI with PRP0001 and is generally something we are
> trying to avoid having people cut and paste into new drivers without
> thinking about it.
> 
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Cc: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
> Cc: Nikita Yushchenko <nikita.yoush@cogentembedded.com>
Applied.

Thanks,

Jonathan

> ---
>  drivers/iio/adc/hi8435.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/iio/adc/hi8435.c b/drivers/iio/adc/hi8435.c
> index 235374ec7bab..074c30970465 100644
> --- a/drivers/iio/adc/hi8435.c
> +++ b/drivers/iio/adc/hi8435.c
> @@ -15,8 +15,7 @@
>  #include <linux/iio/triggered_event.h>
>  #include <linux/interrupt.h>
>  #include <linux/module.h>
> -#include <linux/of.h>
> -#include <linux/of_device.h>
> +#include <linux/mod_devicetable.h>
>  #include <linux/spi/spi.h>
>  #include <linux/gpio/consumer.h>
>  
> @@ -539,7 +538,7 @@ MODULE_DEVICE_TABLE(spi, hi8435_id);
>  static struct spi_driver hi8435_driver = {
>  	.driver	= {
>  		.name		= DRV_NAME,
> -		.of_match_table	= of_match_ptr(hi8435_dt_ids),
> +		.of_match_table	= hi8435_dt_ids,
>  	},
>  	.probe		= hi8435_probe,
>  	.id_table	= hi8435_id,
diff mbox series

Patch

diff --git a/drivers/iio/adc/hi8435.c b/drivers/iio/adc/hi8435.c
index 235374ec7bab..074c30970465 100644
--- a/drivers/iio/adc/hi8435.c
+++ b/drivers/iio/adc/hi8435.c
@@ -15,8 +15,7 @@ 
 #include <linux/iio/triggered_event.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
+#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/gpio/consumer.h>
 
@@ -539,7 +538,7 @@  MODULE_DEVICE_TABLE(spi, hi8435_id);
 static struct spi_driver hi8435_driver = {
 	.driver	= {
 		.name		= DRV_NAME,
-		.of_match_table	= of_match_ptr(hi8435_dt_ids),
+		.of_match_table	= hi8435_dt_ids,
 	},
 	.probe		= hi8435_probe,
 	.id_table	= hi8435_id,