summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2012-03-16 23:31:25 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-16 23:34:00 -0700
commit14b5842ebf552d242b0238f70d0730a564065fb0 (patch)
tree511a82c07295410626fca3b0fcb1b6fbcc197e90 /drivers/input/serio
parent4a53383565e340254479ce4d47bc181884ddf6c3 (diff)
downloadlinux-stable-14b5842ebf552d242b0238f70d0730a564065fb0.tar.gz
linux-stable-14b5842ebf552d242b0238f70d0730a564065fb0.tar.bz2
linux-stable-14b5842ebf552d242b0238f70d0730a564065fb0.zip
Input: altera_ps2 - use of_match_ptr()
Instead of having to define the match table to NULL if CONFIG_OF isn't set, use the of_match_ptr() macro which will do this for us. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio')
-rw-r--r--drivers/input/serio/altera_ps2.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
index 35864c6130bb..cc11f4efe119 100644
--- a/drivers/input/serio/altera_ps2.c
+++ b/drivers/input/serio/altera_ps2.c
@@ -180,8 +180,6 @@ static const struct of_device_id altera_ps2_match[] = {
{},
};
MODULE_DEVICE_TABLE(of, altera_ps2_match);
-#else /* CONFIG_OF */
-#define altera_ps2_match NULL
#endif /* CONFIG_OF */
/*
@@ -193,7 +191,7 @@ static struct platform_driver altera_ps2_driver = {
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
- .of_match_table = altera_ps2_match,
+ .of_match_table = of_match_ptr(altera_ps2_match),
},
};
module_platform_driver(altera_ps2_driver);