PM / Domains: Fix default system suspend/resume operations

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>

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index ad6ba2e..92e6a90 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1435,7 +1435,7 @@ static int pm_genpd_default_restore_state(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);
 }
@@ -1446,7 +1446,7 @@ static int pm_genpd_default_suspend(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);
 }
@@ -1457,7 +1457,7 @@ static int pm_genpd_default_suspend_late(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);
 }
@@ -1468,7 +1468,7 @@ static int pm_genpd_default_resume_early(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);
 }
@@ -1563,10 +1563,10 @@ void pm_genpd_init(struct generic_pm_domain *genpd,
        genpd->domain.ops.complete = pm_genpd_complete;
        genpd->dev_ops.save_state = pm_genpd_default_save_state;
        genpd->dev_ops.restore_state = pm_genpd_default_restore_state;
-       genpd->dev_ops.freeze = pm_genpd_default_suspend;
-       genpd->dev_ops.freeze_late = pm_genpd_default_suspend_late;
-       genpd->dev_ops.thaw_early = pm_genpd_default_resume_early;
-       genpd->dev_ops.thaw = pm_genpd_default_resume;
+       genpd->dev_ops.suspend = pm_genpd_default_suspend;
+       genpd->dev_ops.suspend_late = pm_genpd_default_suspend_late;
+       genpd->dev_ops.resume_early = pm_genpd_default_resume_early;
+       genpd->dev_ops.resume = pm_genpd_default_resume;
        genpd->dev_ops.freeze = pm_genpd_default_freeze;
        genpd->dev_ops.freeze_late = pm_genpd_default_freeze_late;
        genpd->dev_ops.thaw_early = pm_genpd_default_thaw_early;