2013-10-14 05:26:58

by Manish Badarkhe

Subject: [PATCH] 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 <[email protected]>
---
:100644 100644 d664ef5... bd72b0f... M drivers/power/max17042_battery.c
drivers/power/max17042_battery.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
index d664ef5..bd72b0f 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,
--
1.7.10.4

2013-10-25 23:49:53

by Anton Vorontsov

Subject: Re: [PATCH] max17042_battery: use SIMPLE_DEV_PM_OPS

On Mon, Oct 14, 2013 at 10:56:51AM +0530, Manish Badarkhe wrote:
> Use the SIMPLE_DEV_PM_OPS macro to declare the driver's
> pm_ops.
>
> Signed-off-by: Manish Badarkhe <[email protected]>

Applied, thanks!

Anton