summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2012-08-22 07:04:32 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-08-22 07:39:56 +0200
commitf4d4661bee0f54410ac65571b50df5d9fe091d03 (patch)
tree2fe4b1d37a3c2f403f96515c57ea02e5f66947d1 /drivers/input
parentInput: uinput - fix formatting (diff)
downloadlinux-f4d4661bee0f54410ac65571b50df5d9fe091d03.tar.xz
linux-f4d4661bee0f54410ac65571b50df5d9fe091d03.zip
Input: samsung-keypad - 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 <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/samsung-keypad.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
index a061ba603a29..e2f31c8489f5 100644
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@ -662,8 +662,6 @@ static const struct of_device_id samsung_keypad_dt_match[] = {
{},
};
MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match);
-#else
-#define samsung_keypad_dt_match NULL
#endif
static struct platform_device_id samsung_keypad_driver_ids[] = {
@@ -684,7 +682,7 @@ static struct platform_driver samsung_keypad_driver = {
.driver = {
.name = "samsung-keypad",
.owner = THIS_MODULE,
- .of_match_table = samsung_keypad_dt_match,
+ .of_match_table = of_match_ptr(samsung_keypad_dt_match),
.pm = &samsung_keypad_pm_ops,
},
.id_table = samsung_keypad_driver_ids,