commit 400bf2995be617474ebc4b2a0989f2b0a0e498cf
author Dmitry Torokhov <dmitry.torokhov@gmail.com> Mon Nov 07 23:59:35 2011 -0800
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> Wed Nov 09 21:23:36 2011 -0800
tree 90852c80a11d57f27f5240b0b0a1a1418dcb6549
parent 7968a5dd492ccc38345013e534ad4c8d6eb60ed1

Input: samsung-keypad - switch to using SIMPLE_DEV_PM_OPS

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

drivers/input/keyboard/samsung-keypad.c

diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
index f689f49..d244fdf 100644
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@ -381,7 +381,7 @@
 	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 @@
 
 	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 @@
 	.driver		= {
 		.name	= "samsung-keypad",
 		.owner	= THIS_MODULE,
-#ifdef CONFIG_PM
 		.pm	= &samsung_keypad_pm_ops,
-#endif
 	},
 	.id_table	= samsung_keypad_driver_ids,
 };