evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Input: samsung-keypad - use of_match_ptr()

Browse source 
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>
This commit is contained in:
Tobias Klauser 2012-08-21 22:04:32 -07:00 • committed by Dmitry Torokhov
parent 54ce165ebd
commit f4d4661bee
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/keyboard/samsung-keypad.c
View file

@ -662,8 +662,6 @@ static const struct of_device_id samsung_keypad_dt_match[] = {
{}, {},
}; };
MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match); MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match);
#else
#define samsung_keypad_dt_match NULL
#endif #endif
static struct platform_device_id samsung_keypad_driver_ids[] = { static struct platform_device_id samsung_keypad_driver_ids[] = {
@ -684,7 +682,7 @@ static struct platform_driver samsung_keypad_driver = {
.driver = { .driver = {
.name = "samsung-keypad", .name = "samsung-keypad",
.owner = THIS_MODULE, .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, .pm = &samsung_keypad_pm_ops,
}, },
.id_table = samsung_keypad_driver_ids, .id_table = samsung_keypad_driver_ids,