leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PM / Domains: Rename GPD_STATE_WAIT_PARENT to GPD_STATE_WAIT_MASTER

Browse Source 
Since it is now possible for a PM domain to have multiple masters
instead of one parent, rename the "wait for parent" status to reflect
the new situation.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki 2011-08-08 23:43:50 +02:00
parent 5063ce1571
commit 17877eb5a9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,7 +98,7 @@ int __pm_genpd_poweron(struct generic_pm_domain *genpd)
for (;;) { for (;;) {
prepare_to_wait(&genpd->status_wait_queue, &wait, prepare_to_wait(&genpd->status_wait_queue, &wait,
TASK_UNINTERRUPTIBLE); TASK_UNINTERRUPTIBLE);
if (genpd->status != GPD_STATE_WAIT_PARENT) if (genpd->status != GPD_STATE_WAIT_MASTER)
break; break;
mutex_unlock(&genpd->lock); mutex_unlock(&genpd->lock);
@ -124,7 +124,7 @@ int __pm_genpd_poweron(struct generic_pm_domain *genpd)
*/ */
list_for_each_entry(link, &genpd->slave_links, slave_node) { list_for_each_entry(link, &genpd->slave_links, slave_node) {
genpd_sd_counter_inc(link->master); genpd_sd_counter_inc(link->master);
genpd->status = GPD_STATE_WAIT_PARENT; genpd->status = GPD_STATE_WAIT_MASTER;
mutex_unlock(&genpd->lock); mutex_unlock(&genpd->lock);
@ -258,7 +258,7 @@ static void __pm_genpd_restore_device(struct dev_list_entry *dle,
*/ */
static bool genpd_abort_poweroff(struct generic_pm_domain *genpd) static bool genpd_abort_poweroff(struct generic_pm_domain *genpd)
{ {
return genpd->status == GPD_STATE_WAIT_PARENT return genpd->status == GPD_STATE_WAIT_MASTER
|| genpd->status == GPD_STATE_ACTIVE || genpd->resume_count > 0; || genpd->status == GPD_STATE_ACTIVE || genpd->resume_count > 0;
} }
@ -300,7 +300,7 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd)
* (4) System suspend is in progress. * (4) System suspend is in progress.
*/ */
if (genpd->status == GPD_STATE_POWER_OFF if (genpd->status == GPD_STATE_POWER_OFF
|| genpd->status == GPD_STATE_WAIT_PARENT || genpd->status == GPD_STATE_WAIT_MASTER
|| genpd->resume_count > 0 || genpd->prepared_count > 0) || genpd->resume_count > 0 || genpd->prepared_count > 0)
return 0; return 0;

2
include/linux/pm_domain.h
View File

@ -13,7 +13,7 @@
enum gpd_status { enum gpd_status {
GPD_STATE_ACTIVE = 0, /* PM domain is active */ GPD_STATE_ACTIVE = 0, /* PM domain is active */
GPD_STATE_WAIT_PARENT, /* PM domain's parent is being waited for */ GPD_STATE_WAIT_MASTER, /* PM domain's master is being waited for */
GPD_STATE_BUSY, /* Something is happening to the PM domain */ GPD_STATE_BUSY, /* Something is happening to the PM domain */
GPD_STATE_REPEAT, /* Power off in progress, to be repeated */ GPD_STATE_REPEAT, /* Power off in progress, to be repeated */
GPD_STATE_POWER_OFF, /* PM domain is off */ GPD_STATE_POWER_OFF, /* PM domain is off */