Commit 40f84dd0 authored by Jonathan Cameron's avatar Jonathan Cameron

iio:dac:ti-dac082s085: Drop of_match_ptr and CONFIG_OF protections

These prevent the use of this driver with ACPI via PRP0001 and are
an example of an anti pattern I'm trying to remove from IIO.
Hence drop them from this driver.
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Cc: Lukas Wunner <lukas@wunner.de>
Link: https://lore.kernel.org/r/20200910173242.621168-15-jic23@kernel.org
parent 2de887b0
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
...@@ -324,7 +325,6 @@ static int ti_dac_remove(struct spi_device *spi) ...@@ -324,7 +325,6 @@ static int ti_dac_remove(struct spi_device *spi)
return 0; return 0;
} }
#ifdef CONFIG_OF
static const struct of_device_id ti_dac_of_id[] = { static const struct of_device_id ti_dac_of_id[] = {
{ .compatible = "ti,dac082s085" }, { .compatible = "ti,dac082s085" },
{ .compatible = "ti,dac102s085" }, { .compatible = "ti,dac102s085" },
...@@ -335,7 +335,6 @@ static const struct of_device_id ti_dac_of_id[] = { ...@@ -335,7 +335,6 @@ static const struct of_device_id ti_dac_of_id[] = {
{ } { }
}; };
MODULE_DEVICE_TABLE(of, ti_dac_of_id); MODULE_DEVICE_TABLE(of, ti_dac_of_id);
#endif
static const struct spi_device_id ti_dac_spi_id[] = { static const struct spi_device_id ti_dac_spi_id[] = {
{ "dac082s085", dual_8bit }, { "dac082s085", dual_8bit },
...@@ -351,7 +350,7 @@ MODULE_DEVICE_TABLE(spi, ti_dac_spi_id); ...@@ -351,7 +350,7 @@ MODULE_DEVICE_TABLE(spi, ti_dac_spi_id);
static struct spi_driver ti_dac_driver = { static struct spi_driver ti_dac_driver = {
.driver = { .driver = {
.name = "ti-dac082s085", .name = "ti-dac082s085",
.of_match_table = of_match_ptr(ti_dac_of_id), .of_match_table = ti_dac_of_id,
}, },
.probe = ti_dac_probe, .probe = ti_dac_probe,
.remove = ti_dac_remove, .remove = ti_dac_remove,
......
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