diff mbox series

[17/23] iio:adc:ti-adc084s021: drop of_match_ptr protection

Message ID 20200628123654.32830-18-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 ACPI PRP0001 to be used with this driver.
Also adds mod_devicetable.h header as the driver is directly using
struct of_device_id which is defined in that file.

I'm also trying to clear out of_match_ptr use in IIO to avoid it
being cut and paste into new drivers.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Mårten Lindahl <martenli@axis.com>
---
 drivers/iio/adc/ti-adc084s021.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

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

> From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> 
> Allows ACPI PRP0001 to be used with this driver.
> Also adds mod_devicetable.h header as the driver is directly using
> struct of_device_id which is defined in that file.
> 
> I'm also trying to clear out of_match_ptr use in IIO to avoid it
> being cut and paste into new drivers.
> 
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Cc: Mårten Lindahl <martenli@axis.com>
Applied.

Thanks,

Jonathan

> ---
>  drivers/iio/adc/ti-adc084s021.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/adc/ti-adc084s021.c b/drivers/iio/adc/ti-adc084s021.c
> index c2db2435f419..5678bf7499b1 100644
> --- a/drivers/iio/adc/ti-adc084s021.c
> +++ b/drivers/iio/adc/ti-adc084s021.c
> @@ -10,6 +10,7 @@
>  #include <linux/err.h>
>  #include <linux/spi/spi.h>
>  #include <linux/module.h>
> +#include <linux/mod_devicetable.h>
>  #include <linux/interrupt.h>
>  #include <linux/iio/iio.h>
>  #include <linux/iio/buffer.h>
> @@ -254,7 +255,7 @@ MODULE_DEVICE_TABLE(spi, adc084s021_id);
>  static struct spi_driver adc084s021_driver = {
>  	.driver = {
>  		.name = ADC084S021_DRIVER_NAME,
> -		.of_match_table = of_match_ptr(adc084s021_of_match),
> +		.of_match_table = adc084s021_of_match,
>  	},
>  	.probe = adc084s021_probe,
>  	.id_table = adc084s021_id,
diff mbox series

Patch

diff --git a/drivers/iio/adc/ti-adc084s021.c b/drivers/iio/adc/ti-adc084s021.c
index c2db2435f419..5678bf7499b1 100644
--- a/drivers/iio/adc/ti-adc084s021.c
+++ b/drivers/iio/adc/ti-adc084s021.c
@@ -10,6 +10,7 @@ 
 #include <linux/err.h>
 #include <linux/spi/spi.h>
 #include <linux/module.h>
+#include <linux/mod_devicetable.h>
 #include <linux/interrupt.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
@@ -254,7 +255,7 @@  MODULE_DEVICE_TABLE(spi, adc084s021_id);
 static struct spi_driver adc084s021_driver = {
 	.driver = {
 		.name = ADC084S021_DRIVER_NAME,
-		.of_match_table = of_match_ptr(adc084s021_of_match),
+		.of_match_table = adc084s021_of_match,
 	},
 	.probe = adc084s021_probe,
 	.id_table = adc084s021_id,