aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2012-08-22 01:04:32 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-08-22 01:39:56 -0400
commitf4d4661bee0f54410ac65571b50df5d9fe091d03 (patch)
tree2fe4b1d37a3c2f403f96515c57ea02e5f66947d1
parent54ce165ebd9d9494b64149e0d1ab4ddbf5ea908b (diff)
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>
-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 a061ba603a2..e2f31c8489f 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[] = {
662 {}, 662 {},
663}; 663};
664MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match); 664MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match);
665#else
666#define samsung_keypad_dt_match NULL
667#endif 665#endif
668 666
669static struct platform_device_id samsung_keypad_driver_ids[] = { 667static struct platform_device_id samsung_keypad_driver_ids[] = {
@@ -684,7 +682,7 @@ static struct platform_driver samsung_keypad_driver = {
684 .driver = { 682 .driver = {
685 .name = "samsung-keypad", 683 .name = "samsung-keypad",
686 .owner = THIS_MODULE, 684 .owner = THIS_MODULE,
687 .of_match_table = samsung_keypad_dt_match, 685 .of_match_table = of_match_ptr(samsung_keypad_dt_match),
688 .pm = &samsung_keypad_pm_ops, 686 .pm = &samsung_keypad_pm_ops,
689 }, 687 },
690 .id_table = samsung_keypad_driver_ids, 688 .id_table = samsung_keypad_driver_ids,