PM / Domains: Rename GPD_STATE_WAIT_PARENT to GPD_STATE_WAIT_MASTER

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>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 8fc538da1de..c06f8f8717b 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -98,7 +98,7 @@ int __pm_genpd_poweron(struct generic_pm_domain *genpd)
         for (;;) {
                 prepare_to_wait(&genpd->status_wait_queue, &wait,
                                 TASK_UNINTERRUPTIBLE);
-                if (genpd->status != GPD_STATE_WAIT_PARENT)
+                if (genpd->status != GPD_STATE_WAIT_MASTER)
                         break;
                 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) {
                 genpd_sd_counter_inc(link->master);
-                genpd->status = GPD_STATE_WAIT_PARENT;
+                genpd->status = GPD_STATE_WAIT_MASTER;
 
                 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)
 {
-        return genpd->status == GPD_STATE_WAIT_PARENT
+        return genpd->status == GPD_STATE_WAIT_MASTER
                 || 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.
          */
         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)
                 return 0;