PM: domains: Implement the ->set_performance_state() callback for genpd

To enable generic support for performance scaling for PM domains, let's
implement the ->set_performance_state() callback for genpd.

Beyond this change, users of the corresponding genpd specific API,
dev_pm_genpd_set_performance_state() are encouraged to switch to the common
dev_pm_domain_set_performance_state() API.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 5cb2023581d4db5a97bc940cb5fb6b9986be93df..e38fc140d1133b191525815084fdd3f6b73f61ad 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -419,6 +419,25 @@ static void genpd_restore_performance_state(struct device *dev,
                genpd_set_performance_state(dev, state);
 }
 
+static int genpd_dev_pm_set_performance_state(struct device *dev,
+                                             unsigned int state)
+{
+       struct generic_pm_domain *genpd = dev_to_genpd(dev);
+       int ret = 0;
+
+       genpd_lock(genpd);
+       if (pm_runtime_suspended(dev)) {
+               dev_gpd_data(dev)->rpm_pstate = state;
+       } else {
+               ret = genpd_set_performance_state(dev, state);
+               if (!ret)
+                       dev_gpd_data(dev)->rpm_pstate = 0;
+       }
+       genpd_unlock(genpd);
+
+       return ret;
+}
+
 /**
  * dev_pm_genpd_set_performance_state- Set performance state of device's power
  * domain.
@@ -437,7 +456,6 @@ static void genpd_restore_performance_state(struct device *dev,
 int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state)
 {
        struct generic_pm_domain *genpd;
-       int ret = 0;
 
        genpd = dev_to_genpd_safe(dev);
        if (!genpd)
@@ -447,17 +465,7 @@ int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state)
                     !dev->power.subsys_data->domain_data))
                return -EINVAL;
 
-       genpd_lock(genpd);
-       if (pm_runtime_suspended(dev)) {
-               dev_gpd_data(dev)->rpm_pstate = state;
-       } else {
-               ret = genpd_set_performance_state(dev, state);
-               if (!ret)
-                       dev_gpd_data(dev)->rpm_pstate = 0;
-       }
-       genpd_unlock(genpd);
-
-       return ret;
+       return genpd_dev_pm_set_performance_state(dev, state);
 }
 EXPORT_SYMBOL_GPL(dev_pm_genpd_set_performance_state);
 
@@ -2079,6 +2087,7 @@ int pm_genpd_init(struct generic_pm_domain *genpd,
        genpd->domain.ops.restore_noirq = genpd_restore_noirq;
        genpd->domain.ops.complete = genpd_complete;
        genpd->domain.start = genpd_dev_pm_start;
+       genpd->domain.set_performance_state = genpd_dev_pm_set_performance_state;
 
        if (genpd->flags & GENPD_FLAG_PM_CLK) {
                genpd->dev_ops.stop = pm_clk_suspend;