From: Jingkui Wang <jkwang@google.com>
To: linux-input@vger.kernel.org
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Dan Murphy <dmurphy@ti.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] drivers: Remove OF dependency in drv260x driver
Date: Wed, 8 Mar 2017 16:54:02 -0800 [thread overview]
Message-ID: <CACMZmvWLBHPVjaDbqL3Xjibwc+v+c5dgC75Pq7cSmpCG+=tmwQ@mail.gmail.com> (raw)
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>
---
drivers/input/misc/drv260x.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c
index fb089d3..17eb84a 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,
--
2.6.6
next reply other threads:[~2017-03-09 0:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-09 0:54 Jingkui Wang [this message]
2017-03-09 1:08 ` [PATCH] drivers: Remove OF dependency in drv260x driver Dmitry Torokhov
2017-03-09 1:15 ` Jingkui Wang
-- strict thread matches above, loose matches on Subject: below --
2017-03-09 1:24 Jingkui Wang
2017-03-09 17:46 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CACMZmvWLBHPVjaDbqL3Xjibwc+v+c5dgC75Pq7cSmpCG+=tmwQ@mail.gmail.com' \
--to=jkwang@google.com \
--cc=dmitry.torokhov@gmail.com \
--cc=dmurphy@ti.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).