PM: domains: Rename power state enums for genpd

To clarify the code a bit, let's rename GPD_STATE_ACTIVE into
GENPD_STATE_ON and GPD_STATE_POWER_OFF to GENPD_STATE_OFF.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
[ rjw: Subject edit ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 2cb5e04cf86cd313aabdc3b275ec0db988e0c2a5..23aa2feced777bb2879b898cd376e65834997294 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -123,7 +123,7 @@ static const struct genpd_lock_ops genpd_spin_ops = {
 #define genpd_lock_interruptible(p)    p->lock_ops->lock_interruptible(p)
 #define genpd_unlock(p)                        p->lock_ops->unlock(p)
 
-#define genpd_status_on(genpd)         (genpd->status == GPD_STATE_ACTIVE)
+#define genpd_status_on(genpd)         (genpd->status == GENPD_STATE_ON)
 #define genpd_is_irq_safe(genpd)       (genpd->flags & GENPD_FLAG_IRQ_SAFE)
 #define genpd_is_always_on(genpd)      (genpd->flags & GENPD_FLAG_ALWAYS_ON)
 #define genpd_is_active_wakeup(genpd)  (genpd->flags & GENPD_FLAG_ACTIVE_WAKEUP)
@@ -222,7 +222,7 @@ static void genpd_update_accounting(struct generic_pm_domain *genpd)
         * out of off and so update the idle time and vice
         * versa.
         */
-       if (genpd->status == GPD_STATE_ACTIVE) {
+       if (genpd->status == GENPD_STATE_ON) {
                int state_idx = genpd->state_idx;
 
                genpd->states[state_idx].idle_time =
@@ -563,7 +563,7 @@ static int genpd_power_off(struct generic_pm_domain *genpd, bool one_dev_on,
                        return ret;
        }
 
-       genpd->status = GPD_STATE_POWER_OFF;
+       genpd->status = GENPD_STATE_OFF;
        genpd_update_accounting(genpd);
 
        list_for_each_entry(link, &genpd->child_links, child_node) {
@@ -616,7 +616,7 @@ static int genpd_power_on(struct generic_pm_domain *genpd, unsigned int depth)
        if (ret)
                goto err;
 
-       genpd->status = GPD_STATE_ACTIVE;
+       genpd->status = GENPD_STATE_ON;
        genpd_update_accounting(genpd);
 
        return 0;
@@ -961,7 +961,7 @@ static void genpd_sync_power_off(struct generic_pm_domain *genpd, bool use_lock,
        if (_genpd_power_off(genpd, false))
                return;
 
-       genpd->status = GPD_STATE_POWER_OFF;
+       genpd->status = GENPD_STATE_OFF;
 
        list_for_each_entry(link, &genpd->child_links, child_node) {
                genpd_sd_counter_dec(link->parent);
@@ -1007,8 +1007,7 @@ static void genpd_sync_power_on(struct generic_pm_domain *genpd, bool use_lock,
        }
 
        _genpd_power_on(genpd, false);
-
-       genpd->status = GPD_STATE_ACTIVE;
+       genpd->status = GENPD_STATE_ON;
 }
 
 /**
@@ -1287,7 +1286,7 @@ static int genpd_restore_noirq(struct device *dev)
                 * so make it appear as powered off to genpd_sync_power_on(),
                 * so that it tries to power it on in case it was really off.
                 */
-               genpd->status = GPD_STATE_POWER_OFF;
+               genpd->status = GENPD_STATE_OFF;
 
        genpd_sync_power_on(genpd, true, 0);
        genpd_unlock(genpd);
@@ -1777,7 +1776,7 @@ int pm_genpd_init(struct generic_pm_domain *genpd,
        genpd->gov = gov;
        INIT_WORK(&genpd->power_off_work, genpd_power_off_work_fn);
        atomic_set(&genpd->sd_count, 0);
-       genpd->status = is_off ? GPD_STATE_POWER_OFF : GPD_STATE_ACTIVE;
+       genpd->status = is_off ? GENPD_STATE_OFF : GENPD_STATE_ON;
        genpd->device_count = 0;
        genpd->max_off_time_ns = -1;
        genpd->max_off_time_changed = true;
@@ -2802,8 +2801,8 @@ static int genpd_summary_one(struct seq_file *s,
                        struct generic_pm_domain *genpd)
 {
        static const char * const status_lookup[] = {
-               [GPD_STATE_ACTIVE] = "on",
-               [GPD_STATE_POWER_OFF] = "off"
+               [GENPD_STATE_ON] = "on",
+               [GENPD_STATE_OFF] = "off"
        };
        struct pm_domain_data *pm_data;
        const char *kobj_path;
@@ -2881,8 +2880,8 @@ static int summary_show(struct seq_file *s, void *data)
 static int status_show(struct seq_file *s, void *data)
 {
        static const char * const status_lookup[] = {
-               [GPD_STATE_ACTIVE] = "on",
-               [GPD_STATE_POWER_OFF] = "off"
+               [GENPD_STATE_ON] = "on",
+               [GENPD_STATE_OFF] = "off"
        };
 
        struct generic_pm_domain *genpd = s->private;
@@ -2895,7 +2894,7 @@ static int status_show(struct seq_file *s, void *data)
        if (WARN_ON_ONCE(genpd->status >= ARRAY_SIZE(status_lookup)))
                goto exit;
 
-       if (genpd->status == GPD_STATE_POWER_OFF)
+       if (genpd->status == GENPD_STATE_OFF)
                seq_printf(s, "%s-%u\n", status_lookup[genpd->status],
                        genpd->state_idx);
        else
@@ -2938,7 +2937,7 @@ static int idle_states_show(struct seq_file *s, void *data)
                ktime_t delta = 0;
                s64 msecs;
 
-               if ((genpd->status == GPD_STATE_POWER_OFF) &&
+               if ((genpd->status == GENPD_STATE_OFF) &&
                                (genpd->state_idx == i))
                        delta = ktime_sub(ktime_get(), genpd->accounting_time);
 
@@ -2961,7 +2960,7 @@ static int active_time_show(struct seq_file *s, void *data)
        if (ret)
                return -ERESTARTSYS;
 
-       if (genpd->status == GPD_STATE_ACTIVE)
+       if (genpd->status == GENPD_STATE_ON)
                delta = ktime_sub(ktime_get(), genpd->accounting_time);
 
        seq_printf(s, "%lld ms\n", ktime_to_ms(
@@ -2984,7 +2983,7 @@ static int total_idle_time_show(struct seq_file *s, void *data)
 
        for (i = 0; i < genpd->state_count; i++) {
 
-               if ((genpd->status == GPD_STATE_POWER_OFF) &&
+               if ((genpd->status == GENPD_STATE_OFF) &&
                                (genpd->state_idx == i))
                        delta = ktime_sub(ktime_get(), genpd->accounting_time);
 

diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index ee11502a575b0ecaf65439a814da2bd71e0ef053..66f3c5d64d818d5adc2bcab897e512cf36c6dc99 100644 (file)
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -64,8 +64,8 @@
 #define GENPD_FLAG_RPM_ALWAYS_ON (1U << 5)
 
 enum gpd_status {
-       GPD_STATE_ACTIVE = 0,   /* PM domain is active */
-       GPD_STATE_POWER_OFF,    /* PM domain is off */
+       GENPD_STATE_ON = 0,     /* PM domain is on */
+       GENPD_STATE_OFF,        /* PM domain is off */
 };
 
 struct dev_power_governor {