leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iio:adc:mcp3422: remove CONFIG_OF and of_match_ptr protections

Browse Source 
They stop the driver being used with ACPI PRP0001 and are something
I want to avoid being cut and paste into new drivers.
Also switch the include from of.h to mod_devicetable.h as we
struct of_device_id is defined in there and we don't use anything
actually in of.h.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
This commit is contained in:
Jonathan Cameron 2020-06-28 13:36:44 +01:00
parent 016d271e33
commit bf12d3fd11
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/iio/adc/mcp3422.c
View File

@ -16,9 +16,9 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include <linux/of.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
@ -402,18 +402,16 @@ static const struct i2c_device_id mcp3422_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, mcp3422_id); MODULE_DEVICE_TABLE(i2c, mcp3422_id);
#ifdef CONFIG_OF
static const struct of_device_id mcp3422_of_match[] = { static const struct of_device_id mcp3422_of_match[] = {
{ .compatible = "mcp3422" }, { .compatible = "mcp3422" },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, mcp3422_of_match); MODULE_DEVICE_TABLE(of, mcp3422_of_match);
#endif
static struct i2c_driver mcp3422_driver = { static struct i2c_driver mcp3422_driver = {
.driver = { .driver = {
.name = "mcp3422", .name = "mcp3422",
.of_match_table = of_match_ptr(mcp3422_of_match), .of_match_table = mcp3422_of_match,
}, },
.probe = mcp3422_probe, .probe = mcp3422_probe,
.id_table = mcp3422_id, .id_table = mcp3422_id,