From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Linux PM list <linux-pm@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
"Linux-sh list" <linux-sh@vger.kernel.org>,
Magnus Damm <magnus.damm@gmail.com>
Subject: [PATCH] PM / Domains: Fix default system suspend/resume operations
Date: Sun, 4 Dec 2011 21:59:10 +0100 [thread overview]
Message-ID: <201112042159.10576.rjw@sisk.pl> (raw)
From: Rafael J. Wysocki <rjw@sisk.pl>
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 patch is on top of linux-pm/pm-domains.
Thanks,
Rafael
---
drivers/base/power/domain.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
Index: linux/drivers/base/power/domain.c
===================================================================
--- linux.orig/drivers/base/power/domain.c
+++ linux/drivers/base/power/domain.c
@@ -1360,7 +1360,7 @@ static int pm_genpd_default_restore_stat
*/
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);
}
@@ -1371,7 +1371,7 @@ static int pm_genpd_default_suspend(stru
*/
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);
}
@@ -1382,7 +1382,7 @@ static int pm_genpd_default_suspend_late
*/
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);
}
@@ -1393,7 +1393,7 @@ static int pm_genpd_default_resume_early
*/
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);
}
@@ -1487,10 +1487,10 @@ void pm_genpd_init(struct generic_pm_dom
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;
reply other threads:[~2011-12-04 20:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201112042159.10576.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®