Input: adp5588-keys - use new PM macros

[linux-2.6-microblaze.git] / drivers / input / keyboard / adp5588-keys.c

diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index 1db6b28..7cd83c8 100644 (file)
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -827,7 +827,7 @@ static void adp5588_remove(struct i2c_client *client)
        /* all resources will be freed by devm */
 }
 
-static int __maybe_unused adp5588_suspend(struct device *dev)
+static int adp5588_suspend(struct device *dev)
 {
        struct i2c_client *client = to_i2c_client(dev);
 
@@ -836,7 +836,7 @@ static int __maybe_unused adp5588_suspend(struct device *dev)
        return 0;
 }
 
-static int __maybe_unused adp5588_resume(struct device *dev)
+static int adp5588_resume(struct device *dev)
 {
        struct i2c_client *client = to_i2c_client(dev);
 
@@ -845,7 +845,7 @@ static int __maybe_unused adp5588_resume(struct device *dev)
        return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(adp5588_dev_pm_ops, adp5588_suspend, adp5588_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(adp5588_dev_pm_ops, adp5588_suspend, adp5588_resume);
 
 static const struct i2c_device_id adp5588_id[] = {
        { "adp5588-keys", 0 },
@@ -865,7 +865,7 @@ static struct i2c_driver adp5588_driver = {
        .driver = {
                .name = KBUILD_MODNAME,
                .of_match_table = adp5588_of_match,
-               .pm   = &adp5588_dev_pm_ops,
+               .pm   = pm_sleep_ptr(&adp5588_dev_pm_ops),
        },
        .probe    = adp5588_probe,
        .remove   = adp5588_remove,