Input: gpio_keys - switch to using SIMPLE_DEV_PM_OPS
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 9 Jul 2011 19:41:46 +0000 (12:41 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 10 Jul 2011 23:08:32 +0000 (16:08 -0700)
This reduces amount #ifdeds in the code.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/keyboard/gpio_keys.c

index ad11e8647261d0617002044781f923ecc2e5f739..ce281d152275783a8c27893d177b41fb9654a2a2 100644 (file)
@@ -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,
        }
 };