OSDN Git Service

PM / Domains: remove old power on/off latencies
authorAxel Haslam <ahaslam+renesas@baylibre.com>
Mon, 15 Feb 2016 10:10:53 +0000 (11:10 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 15 Feb 2016 22:18:15 +0000 (23:18 +0100)
Now that all known users have been converted to use state latencies,
we can remove the latency field in the generic_pm_domain structure.

Signed-off-by: Axel Haslam <ahaslam+renesas@baylibre.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/base/power/domain.c
include/linux/pm_domain.h

index 4c6f46b..e8ca290 100644 (file)
@@ -1523,14 +1523,8 @@ void pm_genpd_init(struct generic_pm_domain *genpd,
        }
 
        /* Use only one "off" state if there were no states declared */
-       if (genpd->state_count == 0) {
-               genpd->states[0].power_on_latency_ns =
-                                       genpd->power_on_latency_ns;
-               genpd->states[0].power_off_latency_ns =
-                                       genpd->power_off_latency_ns;
-
+       if (genpd->state_count == 0)
                genpd->state_count = 1;
-       }
 
        mutex_lock(&gpd_list_lock);
        list_add(&genpd->gpd_list_node, &gpd_list);
index 1726c4a..49cd889 100644 (file)
@@ -61,9 +61,7 @@ struct generic_pm_domain {
        unsigned int prepared_count;    /* Suspend counter of prepared devices */
        bool suspend_power_off; /* Power status before system suspend */
        int (*power_off)(struct generic_pm_domain *domain);
-       s64 power_off_latency_ns;
        int (*power_on)(struct generic_pm_domain *domain);
-       s64 power_on_latency_ns;
        struct gpd_dev_ops dev_ops;
        s64 max_off_time_ns;    /* Maximum allowed "suspended" time. */
        bool max_off_time_changed;