diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2020-06-28 13:36:37 +0100 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2020-07-07 20:24:08 +0100 |
| commit | 53469fa5c57dac5c9b0b3ef96f671ed5e59609bd (patch) | |
| tree | db53ca91f2b3e7059777c4b0dfc8d319e8473f41 | |
| parent | f84ff467c0ce5b5381ddb9c871c97cd79c40ae1e (diff) | |
| download | linux-53469fa5c57dac5c9b0b3ef96f671ed5e59609bd.tar.gz linux-53469fa5c57dac5c9b0b3ef96f671ed5e59609bd.tar.bz2 linux-53469fa5c57dac5c9b0b3ef96f671ed5e59609bd.zip | |
iio:adc:max1027: drop of_match_ptr and CONFIG_OF protections
These just prevent the driver being used with ACPI PRP0001
and provide no major benefits.
Part of clearing these out in general in IIO to avoid cut and paste
repetition in new drivers. Also include mod_devicetable.h as we
directly make use of of_device_id which is defined in there.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Philippe Reynes <tremyfr@yahoo.fr>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
| -rw-r--r-- | drivers/iio/adc/max1027.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c index 9e993ccd14de..ca1dff3924ff 100644 --- a/drivers/iio/adc/max1027.c +++ b/drivers/iio/adc/max1027.c @@ -14,6 +14,7 @@ #include <linux/kernel.h> #include <linux/module.h> +#include <linux/mod_devicetable.h> #include <linux/spi/spi.h> #include <linux/delay.h> @@ -79,7 +80,6 @@ static const struct spi_device_id max1027_id[] = { }; MODULE_DEVICE_TABLE(spi, max1027_id); -#ifdef CONFIG_OF static const struct of_device_id max1027_adc_dt_ids[] = { { .compatible = "maxim,max1027" }, { .compatible = "maxim,max1029" }, @@ -90,7 +90,6 @@ static const struct of_device_id max1027_adc_dt_ids[] = { {}, }; MODULE_DEVICE_TABLE(of, max1027_adc_dt_ids); -#endif #define MAX1027_V_CHAN(index, depth) \ { \ @@ -518,7 +517,7 @@ static int max1027_probe(struct spi_device *spi) static struct spi_driver max1027_driver = { .driver = { .name = "max1027", - .of_match_table = of_match_ptr(max1027_adc_dt_ids), + .of_match_table = max1027_adc_dt_ids, }, .probe = max1027_probe, .id_table = max1027_id, |