diff options
| author |   Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2020-06-28 13:36:47 +0100 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2020-07-07 20:24:10 +0100 |
| commit | 0896ffdd835601ab3d6b4edf91543c505a3f2757 (patch) | |
| tree | ae056b3ada32de722dedebc5d1d946f8ced55e65 /drivers/iio/adc/ti-adc0832.c | |
| parent | iio:adc:ti-adc081c: Drop of_match_ptr and change to mod_devicetable.h (diff) | |
| download | linux-dev-0896ffdd835601ab3d6b4edf91543c505a3f2757.tar.xz linux-dev-0896ffdd835601ab3d6b4edf91543c505a3f2757.zip | |
iio:adc:ti-adc0832: drop CONFIG_OF and of_match_ptr protections
These just prevent the driver being used with ACPI PRP0001.
I am also trying to remove these from IIO in general to avoid
them being coppied into new drivers.
Also include the mod_devicetable.h header as we are using
of_device_id which is defined in there.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Akinobu Mita <akinobu.mita@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Diffstat (limited to 'drivers/iio/adc/ti-adc0832.c')
| -rw-r--r-- | drivers/iio/adc/ti-adc0832.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/iio/adc/ti-adc0832.c b/drivers/iio/adc/ti-adc0832.c index 3eb3ba5fb610..05061dc05b32 100644 --- a/drivers/iio/adc/ti-adc0832.c +++ b/drivers/iio/adc/ti-adc0832.c @@ -8,6 +8,7 @@ */ #include <linux/module.h> +#include <linux/mod_devicetable.h> #include <linux/spi/spi.h> #include <linux/iio/iio.h> #include <linux/regulator/consumer.h> @@ -313,8 +314,6 @@ static int adc0832_remove(struct spi_device *spi) return 0; } -#ifdef CONFIG_OF - static const struct of_device_id adc0832_dt_ids[] = { { .compatible = "ti,adc0831", }, { .compatible = "ti,adc0832", }, @@ -324,8 +323,6 @@ static const struct of_device_id adc0832_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, adc0832_dt_ids); -#endif - static const struct spi_device_id adc0832_id[] = { { "adc0831", adc0831 }, { "adc0832", adc0832 }, @@ -338,7 +335,7 @@ MODULE_DEVICE_TABLE(spi, adc0832_id); static struct spi_driver adc0832_driver = { .driver = { .name = "adc0832", - .of_match_table = of_match_ptr(adc0832_dt_ids), + .of_match_table = adc0832_dt_ids, }, .probe = adc0832_probe, .remove = adc0832_remove, |