[PATCH 3/5] ds2760: switch to new dev_pm_ops
DORMANTno replies
From: Daniel Mack <hidden>
Date: 2009-08-05 18:29:29
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Daniel Mack <redacted> Cc: Szabolcs Gyurko <redacted> Cc: Matt Reimer <redacted> Cc: Anton Vorontsov <redacted> --- 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