openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio:adc:max1118: Drop CONFIG_OF / of_match_ptr protections 

These just stop the driver being used with ACPI PRP0001 and
we are trying to clear them out of IIO to avoid them getting copied
into new drivers.
Also add the mod_devicetable.h include as we are using
struct 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>
This commit is contained in:
Jonathan Cameron 2020-06-28 13:36:42 +01:00
parent 7a3e190f9c
commit 1fa8b34a62
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/iio/adc/max1118.c
View File

@ -18,6 +18,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include <linux/iio/buffer.h> #include <linux/iio/buffer.h>
@ -280,8 +281,6 @@ static const struct spi_device_id max1118_id[] = {
}; };
MODULE_DEVICE_TABLE(spi, max1118_id); MODULE_DEVICE_TABLE(spi, max1118_id);
#ifdef CONFIG_OF
static const struct of_device_id max1118_dt_ids[] = { static const struct of_device_id max1118_dt_ids[] = {
{ .compatible = "maxim,max1117" }, { .compatible = "maxim,max1117" },
{ .compatible = "maxim,max1118" }, { .compatible = "maxim,max1118" },
@ -290,12 +289,10 @@ static const struct of_device_id max1118_dt_ids[] = {
}; };
MODULE_DEVICE_TABLE(of, max1118_dt_ids); MODULE_DEVICE_TABLE(of, max1118_dt_ids);
#endif
static struct spi_driver max1118_spi_driver = { static struct spi_driver max1118_spi_driver = {
.driver = { .driver = {
.name = "max1118", .name = "max1118",
.of_match_table = of_match_ptr(max1118_dt_ids), .of_match_table = max1118_dt_ids,
}, },
.probe = max1118_probe, .probe = max1118_probe,
.remove = max1118_remove, .remove = max1118_remove,