浏览代码

Input: gpio_keys - switch to using SIMPLE_DEV_PM_OPS

This reduces amount #ifdeds in the code.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Dmitry Torokhov 14 年之前
父节点
当前提交
bdda821628
共有 1 个文件被更改,包括 3 次插入8 次删除
  1. 3 8
      drivers/input/keyboard/gpio_keys.c

+ 3 - 8
drivers/input/keyboard/gpio_keys.c

@@ -693,7 +693,7 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev)
 	return 0;
 	return 0;
 }
 }
 
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int gpio_keys_suspend(struct device *dev)
 static int gpio_keys_suspend(struct device *dev)
 {
 {
 	struct gpio_keys_drvdata *ddata = dev_get_drvdata(dev);
 	struct gpio_keys_drvdata *ddata = dev_get_drvdata(dev);
@@ -731,22 +731,17 @@ static int gpio_keys_resume(struct device *dev)
 
 
 	return 0;
 	return 0;
 }
 }
-
-static const struct dev_pm_ops gpio_keys_pm_ops = {
-	.suspend	= gpio_keys_suspend,
-	.resume		= gpio_keys_resume,
-};
 #endif
 #endif
 
 
+static SIMPLE_DEV_PM_OPS(gpio_keys_pm_ops, gpio_keys_suspend, gpio_keys_resume);
+
 static struct platform_driver gpio_keys_device_driver = {
 static struct platform_driver gpio_keys_device_driver = {
 	.probe		= gpio_keys_probe,
 	.probe		= gpio_keys_probe,
 	.remove		= __devexit_p(gpio_keys_remove),
 	.remove		= __devexit_p(gpio_keys_remove),
 	.driver		= {
 	.driver		= {
 		.name	= "gpio-keys",
 		.name	= "gpio-keys",
 		.owner	= THIS_MODULE,
 		.owner	= THIS_MODULE,
-#ifdef CONFIG_PM
 		.pm	= &gpio_keys_pm_ops,
 		.pm	= &gpio_keys_pm_ops,
-#endif
 		.of_match_table = gpio_keys_of_match,
 		.of_match_table = gpio_keys_of_match,
 	}
 	}
 };
 };