Commit 89f0f170 authored by Dmitry Torokhov's avatar Dmitry Torokhov

Input: nomadik-ske-keypad - convert to using SIMPLE_DEV_PM_OPS

Also proper guard for system suspend/resume methods is CONFIG_PM_SLEEP,
not CONFIG_PM.
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent db3dbd09
...@@ -344,7 +344,7 @@ static int __devexit ske_keypad_remove(struct platform_device *pdev) ...@@ -344,7 +344,7 @@ static int __devexit ske_keypad_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int ske_keypad_suspend(struct device *dev) static int ske_keypad_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
...@@ -372,20 +372,16 @@ static int ske_keypad_resume(struct device *dev) ...@@ -372,20 +372,16 @@ static int ske_keypad_resume(struct device *dev)
return 0; return 0;
} }
static const struct dev_pm_ops ske_keypad_dev_pm_ops = {
.suspend = ske_keypad_suspend,
.resume = ske_keypad_resume,
};
#endif #endif
static SIMPLE_DEV_PM_OPS(ske_keypad_dev_pm_ops,
ske_keypad_suspend, ske_keypad_resume);
static struct platform_driver ske_keypad_driver = { static struct platform_driver ske_keypad_driver = {
.driver = { .driver = {
.name = "nmk-ske-keypad", .name = "nmk-ske-keypad",
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &ske_keypad_dev_pm_ops, .pm = &ske_keypad_dev_pm_ops,
#endif
}, },
.remove = __devexit_p(ske_keypad_remove), .remove = __devexit_p(ske_keypad_remove),
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment