hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jingkui Wang 2017-03-09 09:46:17 -08:00 committed by Dmitry Torokhov
parent fad358a06c
commit bc682a50a0
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/misc/drv260x.c
View File

@ -652,7 +652,6 @@ static const struct i2c_device_id drv260x_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, drv260x_id); MODULE_DEVICE_TABLE(i2c, drv260x_id);
#ifdef CONFIG_OF
static const struct of_device_id drv260x_of_match[] = { static const struct of_device_id drv260x_of_match[] = {
{ .compatible = "ti,drv2604", }, { .compatible = "ti,drv2604", },
{ .compatible = "ti,drv2604l", }, { .compatible = "ti,drv2604l", },
@ -661,13 +660,12 @@ static const struct of_device_id drv260x_of_match[] = {
{ } { }
}; };
MODULE_DEVICE_TABLE(of, drv260x_of_match); MODULE_DEVICE_TABLE(of, drv260x_of_match);
#endif
static struct i2c_driver drv260x_driver = { static struct i2c_driver drv260x_driver = {
.probe = drv260x_probe, .probe = drv260x_probe,
.driver = { .driver = {
.name = "drv260x-haptics", .name = "drv260x-haptics",
.of_match_table = of_match_ptr(drv260x_of_match), .of_match_table = drv260x_of_match,
.pm = &drv260x_pm_ops, .pm = &drv260x_pm_ops,
}, },
.id_table = drv260x_id, .id_table = drv260x_id,