]> Pileus Git - ~andy/linux/commitdiff
max17042_battery: Use SIMPLE_DEV_PM_OPS
authorManish Badarkhe <badarkhe.manish@gmail.com>
Mon, 14 Oct 2013 05:26:51 +0000 (10:56 +0530)
committerAnton Vorontsov <anton@enomsg.org>
Fri, 25 Oct 2013 23:48:30 +0000 (16:48 -0700)
Use the SIMPLE_DEV_PM_OPS macro to declare the driver's pm_ops.

Signed-off-by: Manish Badarkhe <badarkhe.manish@gmail.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
drivers/power/max17042_battery.c

index d664ef58afa7d0ffd34d03e89444cd015f31ab7d..bd72b0f7f729ee5a782cdf7cc4c8a17f90cd79b0 100644 (file)
@@ -786,7 +786,7 @@ static int max17042_remove(struct i2c_client *client)
        return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int max17042_suspend(struct device *dev)
 {
        struct max17042_chip *chip = dev_get_drvdata(dev);
@@ -816,17 +816,11 @@ static int max17042_resume(struct device *dev)
 
        return 0;
 }
-
-static const struct dev_pm_ops max17042_pm_ops = {
-       .suspend        = max17042_suspend,
-       .resume         = max17042_resume,
-};
-
-#define MAX17042_PM_OPS (&max17042_pm_ops)
-#else
-#define MAX17042_PM_OPS NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(max17042_pm_ops, max17042_suspend,
+                       max17042_resume);
+
 #ifdef CONFIG_OF
 static const struct of_device_id max17042_dt_match[] = {
        { .compatible = "maxim,max17042" },
@@ -849,7 +843,7 @@ static struct i2c_driver max17042_i2c_driver = {
        .driver = {
                .name   = "max17042",
                .of_match_table = of_match_ptr(max17042_dt_match),
-               .pm     = MAX17042_PM_OPS,
+               .pm     = &max17042_pm_ops,
        },
        .probe          = max17042_probe,
        .remove         = max17042_remove,