mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Linux PM mailing list <linux-pm@lists.linux-foundation.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Kevin Hilman <khilman@ti.com>,
	Alan Stern <stern@rowland.harvard.edu>,
	MyungJoo Ham <myungjoo.ham@samsung.com>,
	Chanwoo Choi <cw00.choi@samsung.com>,
	Paul Walmsley <paul@pwsan.com>, Greg KH <gregkh@suse.de>,
	Magnus Damm <magnus.damm@gmail.com>
Subject: [PATCH 5/6 v2] PM / Domains: Do not restore all devices on power off error
Date: Sun, 10 Jul 2011 11:08:46 +0200	[thread overview]
Message-ID: <201107101108.46688.rjw@sisk.pl> (raw)
In-Reply-To: <201107101059.30322.rjw@sisk.pl>

From: Rafael J. Wysocki <rjw@sisk.pl>

Since every device in a PM domain has its own need_restore
flag, which is set by __pm_genpd_save_device(), there's no need to
walk the domain's device list and restore all devices on an error
from one of the drivers' .runtime_suspend() callbacks.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 drivers/base/power/domain.c |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

Index: linux-2.6/drivers/base/power/domain.c
===================================================================
--- linux-2.6.orig/drivers/base/power/domain.c
+++ linux-2.6/drivers/base/power/domain.c
@@ -269,8 +269,10 @@ static int pm_genpd_poweroff(struct gene
 
 	list_for_each_entry_reverse(dle, &genpd->dev_list, node) {
 		ret = __pm_genpd_save_device(dle, genpd);
-		if (ret)
-			goto err_dev;
+		if (ret) {
+			genpd_set_active(genpd);
+			goto out;
+		}
 
 		if (genpd_abort_poweroff(genpd))
 			goto out;
@@ -311,13 +313,6 @@ static int pm_genpd_poweroff(struct gene
 	genpd->poweroff_task = NULL;
 	wake_up_all(&genpd->status_wait_queue);
 	return ret;
-
- err_dev:
-	list_for_each_entry_continue(dle, &genpd->dev_list, node)
-		__pm_genpd_restore_device(dle, genpd);
-
-	genpd_set_active(genpd);
-	goto out;
 }
 
 /**


  parent reply	other threads:[~2011-07-10  9:10 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-06 20:48 [PATCH 0/5 v1] PM / Domains: Generic PM domains improvements Rafael J. Wysocki
2011-07-06 20:50 ` [PATCH 1/5 v1] PM / Domains: Set device state to "active" during system resume Rafael J. Wysocki
2011-07-06 20:51 ` [PATCH 2/5 v1] PM / Domains: Make failing pm_genpd_prepare() clean up properly Rafael J. Wysocki
2011-07-06 20:53 ` [PATCH 3/5 v1] PM / Domains: Rework locking Rafael J. Wysocki
2011-07-08 10:21   ` [Update][PATCH 3/5] " Rafael J. Wysocki
2011-07-06 21:00 ` [PATCH 4/5 v1] PM / Domains: Allow callbacks to execute arbitrary runtime PM helpers Rafael J. Wysocki
2011-07-07 19:59   ` [Update][PATCH 4/5] PM / Domains: Allow callbacks to execute all " Rafael J. Wysocki
2011-07-06 21:01 ` [PATCH 5/5 v1] PM / Domains: Do not restore all devices on power off error Rafael J. Wysocki
2011-07-07 20:01   ` [Update][PATCH 5/5] " Rafael J. Wysocki
2011-07-06 21:08 ` [PATCH 0/5 v1] PM / Domains: Generic PM domains improvements Greg KH
2011-07-06 21:12   ` Rafael J. Wysocki
2011-07-10  8:59 ` [PATCH 0/6 v2] " Rafael J. Wysocki
2011-07-10  9:05   ` [PATCH 1/6 v2] PM / Domains: Set device state to "active" during system resume Rafael J. Wysocki
2011-07-10  9:06   ` [PATCH 2/6 v2] PM / Domains: Make failing pm_genpd_prepare() clean up properly Rafael J. Wysocki
2011-07-10  9:07   ` [PATCH 3/6 v2] PM / Domains: Do not execute device callbacks under locks Rafael J. Wysocki
2011-07-10  9:08   ` [PATCH 4/6 v2] PM / Domains: Allow callbacks to execute all runtime PM helpers Rafael J. Wysocki
2011-07-10  9:08   ` Rafael J. Wysocki [this message]
2011-07-10  9:09   ` [PATCH 6/6 v2] PM / Domains: Improve handling of wakeup devices during system suspend Rafael J. Wysocki
2011-07-10 12:29   ` [PATCH 7 v2] PM / Domains: Queue up power off work only if it is not pending Rafael J. Wysocki

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=201107101108.46688.rjw@sisk.pl \
    --to=rjw@sisk.pl \
    --cc=cw00.choi@samsung.com \
    --cc=gregkh@suse.de \
    --cc=khilman@ti.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@lists.linux-foundation.org \
    --cc=magnus.damm@gmail.com \
    --cc=myungjoo.ham@samsung.com \
    --cc=paul@pwsan.com \
    --cc=stern@rowland.harvard.edu \
    /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®