Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-14 17:53:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PM / Domains: Fix default system suspend/resume operations

Browse Source 
Commit d23b9b00cdde5c93b914a172cecd57d5625fcd04 (PM / Domains: Rework
system suspend callback routines (v2)) broke the system suspend and
resume handling by devices belonging to generic PM domains, because
it used freeze/thaw callbacks instead of suspend/resume ones and
didn't initialize device callbacks for system suspend/resume
properly at all.  Fix those problems.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki 2011-12-06 23:16:47 +01:00
parent e84b2c2027
commit c9914854b4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/base/power/domain.c
View File

@ -1435,7 +1435,7 @@ static int pm_genpd_default_restore_state(struct device *dev)
*/ */
static int pm_genpd_default_suspend(struct device *dev) static int pm_genpd_default_suspend(struct device *dev)
{ {
int (*cb)(struct device *__dev) = dev_gpd_data(dev)->ops.freeze; int (*cb)(struct device *__dev) = dev_gpd_data(dev)->ops.suspend;
return cb ? cb(dev) : pm_generic_suspend(dev); return cb ? cb(dev) : pm_generic_suspend(dev);
} }
@ -1446,7 +1446,7 @@ static int pm_genpd_default_suspend(struct device *dev)
*/ */
static int pm_genpd_default_suspend_late(struct device *dev) static int pm_genpd_default_suspend_late(struct device *dev)
{ {
int (*cb)(struct device *__dev) = dev_gpd_data(dev)->ops.freeze_late; int (*cb)(struct device *__dev) = dev_gpd_data(dev)->ops.suspend_late;
return cb ? cb(dev) : pm_generic_suspend_noirq(dev); return cb ? cb(dev) : pm_generic_suspend_noirq(dev);
} }
@ -1457,7 +1457,7 @@ static int pm_genpd_default_suspend_late(struct device *dev)
*/ */
static int pm_genpd_default_resume_early(struct device *dev) static int pm_genpd_default_resume_early(struct device *dev)
{ {
int (*cb)(struct device *__dev) = dev_gpd_data(dev)->ops.thaw_early; int (*cb)(struct device *__dev) = dev_gpd_data(dev)->ops.resume_early;
return cb ? cb(dev) : pm_generic_resume_noirq(dev); return cb ? cb(dev) : pm_generic_resume_noirq(dev);
} }
@ -1468,7 +1468,7 @@ static int pm_genpd_default_resume_early(struct device *dev)
*/ */
static int pm_genpd_default_resume(struct device *dev) static int pm_genpd_default_resume(struct device *dev)
{ {
int (*cb)(struct device *__dev) = dev_gpd_data(dev)->ops.thaw; int (*cb)(struct device *__dev) = dev_gpd_data(dev)->ops.resume;
return cb ? cb(dev) : pm_generic_resume(dev); return cb ? cb(dev) : pm_generic_resume(dev);
} }
@ -1563,10 +1563,10 @@ void pm_genpd_init(struct generic_pm_domain *genpd,
genpd->domain.ops.complete = pm_genpd_complete; genpd->domain.ops.complete = pm_genpd_complete;
genpd->dev_ops.save_state = pm_genpd_default_save_state; genpd->dev_ops.save_state = pm_genpd_default_save_state;
genpd->dev_ops.restore_state = pm_genpd_default_restore_state; genpd->dev_ops.restore_state = pm_genpd_default_restore_state;
genpd->dev_ops.freeze = pm_genpd_default_suspend; genpd->dev_ops.suspend = pm_genpd_default_suspend;
genpd->dev_ops.freeze_late = pm_genpd_default_suspend_late; genpd->dev_ops.suspend_late = pm_genpd_default_suspend_late;
genpd->dev_ops.thaw_early = pm_genpd_default_resume_early; genpd->dev_ops.resume_early = pm_genpd_default_resume_early;
genpd->dev_ops.thaw = pm_genpd_default_resume; genpd->dev_ops.resume = pm_genpd_default_resume;
genpd->dev_ops.freeze = pm_genpd_default_freeze; genpd->dev_ops.freeze = pm_genpd_default_freeze;
genpd->dev_ops.freeze_late = pm_genpd_default_freeze_late; genpd->dev_ops.freeze_late = pm_genpd_default_freeze_late;
genpd->dev_ops.thaw_early = pm_genpd_default_thaw_early; genpd->dev_ops.thaw_early = pm_genpd_default_thaw_early;