dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Input: samsung-keypad - switch to using SIMPLE_DEV_PM_OPS 

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2011-11-07 23:59:35 -08:00
parent 7968a5dd49
commit 400bf2995b
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/input/keyboard/samsung-keypad.c
View File

@ -381,7 +381,7 @@ static int __devexit samsung_keypad_remove(struct platform_device *pdev)
return 0;
}
#ifdef CONFIG_PM
#ifdef CONFIG_PM_SLEEP
static void samsung_keypad_toggle_wakeup(struct samsung_keypad *keypad,
bool enable)
{
@ -440,13 +440,11 @@ static int samsung_keypad_resume(struct device *dev)
return 0;
}
static const struct dev_pm_ops samsung_keypad_pm_ops = {
.suspend = samsung_keypad_suspend,
.resume = samsung_keypad_resume,
};
#endif
static SIMPLE_DEV_PM_OPS(samsung_keypad_pm_ops,
samsung_keypad_suspend, samsung_keypad_resume);
static struct platform_device_id samsung_keypad_driver_ids[] = {
{
.name = "samsung-keypad",
@ -465,9 +463,7 @@ static struct platform_driver samsung_keypad_driver = {
.driver = {
.name = "samsung-keypad",
.owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &samsung_keypad_pm_ops,
#endif
},
.id_table = samsung_keypad_driver_ids,
};