summaryrefslogtreecommitdiff
path: root/drivers/input/misc/drv260x.c
diff options
context:
space:
mode:
authorJingkui Wang <jkwang@google.com>2017-03-09 20:46:17 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-03-09 21:00:14 +0300
commitbc682a50a0716f556cf6dfb209bd8d772c1d635c (patch)
treede556fdcbf5a4c7a9d6659053f680eac2c970d5b /drivers/input/misc/drv260x.c
parentfad358a06c51bd40a131f4f94711c46e5d77cdae (diff)
downloadlinux-bc682a50a0716f556cf6dfb209bd8d772c1d635c.tar.xz
Input: drv260x - remove OF dependency
As the driver is using generic device properties, it should work properly when CONFIG_OF is turned off. This patch removes the ifdef CONFIGOF and make sure the driver always have of_match_table. Signed-off-by: Jingkui Wang <jkwang@google.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/misc/drv260x.c')
-rw-r--r--drivers/input/misc/drv260x.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c
index fb089d36c0d6..17eb84ab4c0b 100644
--- a/drivers/input/misc/drv260x.c
+++ b/drivers/input/misc/drv260x.c
@@ -652,7 +652,6 @@ static const struct i2c_device_id drv260x_id[] = {
};
MODULE_DEVICE_TABLE(i2c, drv260x_id);
-#ifdef CONFIG_OF
static const struct of_device_id drv260x_of_match[] = {
{ .compatible = "ti,drv2604", },
{ .compatible = "ti,drv2604l", },
@@ -661,13 +660,12 @@ static const struct of_device_id drv260x_of_match[] = {
{ }
};
MODULE_DEVICE_TABLE(of, drv260x_of_match);
-#endif
static struct i2c_driver drv260x_driver = {
.probe = drv260x_probe,
.driver = {
.name = "drv260x-haptics",
- .of_match_table = of_match_ptr(drv260x_of_match),
+ .of_match_table = drv260x_of_match,
.pm = &drv260x_pm_ops,
},
.id_table = drv260x_id,