From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 8 Nov 2011 07:59:35 +0000 (-0800)
Subject: Input: samsung-keypad - switch to using SIMPLE_DEV_PM_OPS
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~1163^2^2~46
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=400bf2995be617474ebc4b2a0989f2b0a0e498cf;p=mirror_ubuntu-zesty-kernel.git

Input: samsung-keypad - switch to using SIMPLE_DEV_PM_OPS

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

diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
index f689f49e3109..d244fdf9ecdf 100644
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@ -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,
 };