[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1249496971-9019-3-git-send-email-daniel@caiaq.de>
Date: Wed, 5 Aug 2009 20:29:29 +0200
From: Daniel Mack <daniel@...aq.de>
To: linux-kernel@...r.kernel.org
Cc: linux-pm@...ts.linux-foundation.org, Daniel Mack <daniel@...aq.de>,
Szabolcs Gyurko <szabolcs.gyurko@....hu>,
Matt Reimer <mreimer@...p.net>, Anton Vorontsov <cbou@...l.ru>
Subject: [PATCH 3/5] ds2760: switch to new dev_pm_ops
Signed-off-by: Daniel Mack <daniel@...aq.de>
Cc: Szabolcs Gyurko <szabolcs.gyurko@....hu>
Cc: Matt Reimer <mreimer@...p.net>
Cc: Anton Vorontsov <cbou@...l.ru>
---
drivers/power/ds2760_battery.c | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c
index ca43b1c..3c9d8cd 100644
--- a/drivers/power/ds2760_battery.c
+++ b/drivers/power/ds2760_battery.c
@@ -557,19 +557,18 @@ static int ds2760_battery_remove(struct platform_device *pdev)
#ifdef CONFIG_PM
-static int ds2760_battery_suspend(struct platform_device *pdev,
- pm_message_t state)
+static int ds2760_battery_suspend(struct device *dev)
{
- struct ds2760_device_info *di = platform_get_drvdata(pdev);
+ struct ds2760_device_info *di = dev_get_drvdata(dev);
di->charge_status = POWER_SUPPLY_STATUS_UNKNOWN;
return 0;
}
-static int ds2760_battery_resume(struct platform_device *pdev)
+static int ds2760_battery_resume(struct device *dev)
{
- struct ds2760_device_info *di = platform_get_drvdata(pdev);
+ struct ds2760_device_info *di = dev_get_drvdata(dev);
di->charge_status = POWER_SUPPLY_STATUS_UNKNOWN;
power_supply_changed(&di->bat);
@@ -580,23 +579,29 @@ static int ds2760_battery_resume(struct platform_device *pdev)
return 0;
}
-#else
+static struct dev_pm_ops ds2760_battery_pm_ops = {
+ .suspend = ds2760_battery_suspend,
+ .freeze = ds2760_battery_suspend,
+ .resume = ds2760_battery_resume,
+ .thaw = ds2760_battery_resume,
+};
-#define ds2760_battery_suspend NULL
-#define ds2760_battery_resume NULL
+#define DS2760_PM_OPS (&ds2760_battery_pm_ops)
+#else
+#define DS2760_PM_OPS NULL
#endif /* CONFIG_PM */
MODULE_ALIAS("platform:ds2760-battery");
static struct platform_driver ds2760_battery_driver = {
.driver = {
- .name = "ds2760-battery",
+ .owner = THIS_MODULE,
+ .name = "ds2760-battery",
+ .pm = DS2760_PM_OPS,
},
.probe = ds2760_battery_probe,
.remove = ds2760_battery_remove,
- .suspend = ds2760_battery_suspend,
- .resume = ds2760_battery_resume,
};
static int __init ds2760_battery_init(void)
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists