mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
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: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
parent
ad5bd081c6
commit
0a4596f5bd
1 changed files with 2 additions and 3 deletions
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue