Commit 0a4596f5 authored by Jonathan Cameron's avatar Jonathan Cameron

iio:adc:ti-adc108s102: Drop CONFIG_OF and of_match_ptr protections

I'm 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.
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
parent ad5bd081
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <linux/iio/trigger_consumer.h> #include <linux/iio/trigger_consumer.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/property.h> #include <linux/property.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
...@@ -299,13 +300,11 @@ static int adc108s102_remove(struct spi_device *spi) ...@@ -299,13 +300,11 @@ static int adc108s102_remove(struct spi_device *spi)
return 0; return 0;
} }
#ifdef CONFIG_OF
static const struct of_device_id adc108s102_of_match[] = { static const struct of_device_id adc108s102_of_match[] = {
{ .compatible = "ti,adc108s102" }, { .compatible = "ti,adc108s102" },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, adc108s102_of_match); MODULE_DEVICE_TABLE(of, adc108s102_of_match);
#endif
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static const struct acpi_device_id adc108s102_acpi_ids[] = { static const struct acpi_device_id adc108s102_acpi_ids[] = {
...@@ -324,7 +323,7 @@ MODULE_DEVICE_TABLE(spi, adc108s102_id); ...@@ -324,7 +323,7 @@ MODULE_DEVICE_TABLE(spi, adc108s102_id);
static struct spi_driver adc108s102_driver = { static struct spi_driver adc108s102_driver = {
.driver = { .driver = {
.name = "adc108s102", .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), .acpi_match_table = ACPI_PTR(adc108s102_acpi_ids),
}, },
.probe = adc108s102_probe, .probe = adc108s102_probe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment