diff options
| author |   Manish Badarkhe <badarkhe.manish@gmail.com> | 2013-10-14 10:56:51 +0530 |
|---|---|---|
| committer |   Anton Vorontsov <anton@enomsg.org> | 2013-10-25 16:48:30 -0700 |
| commit | 3d23c7f457ed86f27425cb3f229b76720855a26d (patch) | |
| tree | 4d302f3f57a8f0fc3fbd842c3d26fc45b55d509e /drivers/power/max17042_battery.c | |
| parent | charger-manager : Replace kzalloc to devm_kzalloc and remove uneccessary code (diff) | |
| download | linux-dev-3d23c7f457ed86f27425cb3f229b76720855a26d.tar.xz linux-dev-3d23c7f457ed86f27425cb3f229b76720855a26d.zip | |
max17042_battery: Use SIMPLE_DEV_PM_OPS
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>
Diffstat (limited to 'drivers/power/max17042_battery.c')
| -rw-r--r-- | drivers/power/max17042_battery.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c index d664ef58afa7..bd72b0f7f729 100644 --- a/drivers/power/max17042_battery.c +++ b/drivers/power/max17042_battery.c @@ -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, |