From 2ca77eb3d4fc94809d751c318c55b46d7c84943a Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Sat, 9 Jul 2011 12:41:46 -0700
Subject: [PATCH] --- yaml --- r: 260779 b: refs/heads/master c:
 bdda82162837a20e591ac01b306dc8f052270510 h: refs/heads/master i:   260777:
 4509d84071b954a679dd19f4caf7f0cbd3cc6ed9   260775:
 89f695cf18b841998989f3cd5f7b21859db9c177 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/input/keyboard/gpio_keys.c | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index f58f51113c66..eb131d9c58cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd05d08920b54d189aa247c5c5701a08e539ed0b
+refs/heads/master: bdda82162837a20e591ac01b306dc8f052270510
diff --git a/trunk/drivers/input/keyboard/gpio_keys.c b/trunk/drivers/input/keyboard/gpio_keys.c
index ad11e8647261..ce281d152275 100644
--- a/trunk/drivers/input/keyboard/gpio_keys.c
+++ b/trunk/drivers/input/keyboard/gpio_keys.c
@@ -693,7 +693,7 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int gpio_keys_suspend(struct device *dev)
 {
 	struct gpio_keys_drvdata *ddata = dev_get_drvdata(dev);
@@ -731,22 +731,17 @@ static int gpio_keys_resume(struct device *dev)
 
 	return 0;
 }
-
-static const struct dev_pm_ops gpio_keys_pm_ops = {
-	.suspend	= gpio_keys_suspend,
-	.resume		= gpio_keys_resume,
-};
 #endif
 
+static SIMPLE_DEV_PM_OPS(gpio_keys_pm_ops, gpio_keys_suspend, gpio_keys_resume);
+
 static struct platform_driver gpio_keys_device_driver = {
 	.probe		= gpio_keys_probe,
 	.remove		= __devexit_p(gpio_keys_remove),
 	.driver		= {
 		.name	= "gpio-keys",
 		.owner	= THIS_MODULE,
-#ifdef CONFIG_PM
 		.pm	= &gpio_keys_pm_ops,
-#endif
 		.of_match_table = gpio_keys_of_match,
 	}
 };