|
@@ -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,
|
|
|
}
|
|
|
};
|