On Sun, Jun 28, 2020 at 3:39 PM Jonathan Cameron <jic23@xxxxxxxxxx> wrote:
>
> From: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
>
> Although this driver has an explicit ACPI binding it is good to also
> allow for PRP0001 use of the of_match_id table.
>
> I'm also trying to clean this (now) anti-pattern out of IIO to avoid
> cut and paste into new drivers.
>
> Also add an include of mod_devicetable.h as the driver directly uses
> struct of_device_id which is defined in there.
>
I think this is not needed. At least the commit message in this case
is misleading.
We have only one ID and ACPI already has it. So, there is no need for
this patch from that perspective.
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> Cc: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
> ---
> drivers/iio/adc/ti-adc108s102.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/adc/ti-adc108s102.c b/drivers/iio/adc/ti-adc108s102.c
> index 9b9b27415c93..183b2245e89b 100644
> --- a/drivers/iio/adc/ti-adc108s102.c
> +++ b/drivers/iio/adc/ti-adc108s102.c
> @@ -20,6 +20,7 @@
> #include <linux/iio/trigger_consumer.h>
> #include <linux/interrupt.h>
> #include <linux/module.h>
> +#include <linux/mod_devicetable.h>
> #include <linux/property.h>
> #include <linux/regulator/consumer.h>
> #include <linux/spi/spi.h>
> @@ -299,13 +300,11 @@ static int adc108s102_remove(struct spi_device *spi)
> return 0;
> }
>
> -#ifdef CONFIG_OF
> static const struct of_device_id adc108s102_of_match[] = {
> { .compatible = "ti,adc108s102" },
> { }
> };
> MODULE_DEVICE_TABLE(of, adc108s102_of_match);
> -#endif
>
> #ifdef CONFIG_ACPI
> static const struct acpi_device_id adc108s102_acpi_ids[] = {
> @@ -324,7 +323,7 @@ MODULE_DEVICE_TABLE(spi, adc108s102_id);
> static struct spi_driver adc108s102_driver = {
> .driver = {
> .name = "adc108s102",
> - .of_match_table = of_match_ptr(adc108s102_of_match),
> + .of_match_table = adc108s102_of_match,
> .acpi_match_table = ACPI_PTR(adc108s102_acpi_ids),
> },
> .probe = adc108s102_probe,
> --
> 2.27.0
>
--
With Best Regards,
Andy Shevchenko
