opp: Rename regulator_enabled and use it as status of all resources

Expand the scope of the regulator_enabled flag and use it to track
status of all the resources. This will be used for other stuff in the
next patch.

Tested-by: Rajendra Nayak <rnayak@codeaurora.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index 9668ea0..6f43ef4 100644 (file)
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -703,12 +703,10 @@ static int _generic_set_opp_regulator(struct opp_table *opp_table,
         * Enable the regulator after setting its voltages, otherwise it breaks
         * some boot-enabled regulators.
         */
-       if (unlikely(!opp_table->regulator_enabled)) {
+       if (unlikely(!opp_table->enabled)) {
                ret = regulator_enable(reg);
                if (ret < 0)
                        dev_warn(dev, "Failed to enable regulator: %d", ret);
-               else
-                       opp_table->regulator_enabled = true;
        }
 
        return 0;
@@ -909,12 +907,12 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
                if (ret)
                        goto put_opp_table;
 
-               if (opp_table->regulator_enabled) {
+               if (opp_table->regulators)
                        regulator_disable(opp_table->regulators[0]);
-                       opp_table->regulator_enabled = false;
-               }
 
                ret = _set_required_opps(dev, opp_table, NULL);
+
+               opp_table->enabled = false;
                goto put_opp_table;
        }
 
@@ -1001,8 +999,11 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
                        dev_err(dev, "Failed to set required opps: %d\n", ret);
        }
 
-       if (!ret)
+       if (!ret) {
                ret = _set_opp_bw(opp_table, opp, dev, false);
+               if (!ret)
+                       opp_table->enabled = true;
+       }
 
 put_opp:
        dev_pm_opp_put(opp);
@@ -1796,11 +1797,9 @@ void dev_pm_opp_put_regulators(struct opp_table *opp_table)
        /* Make sure there are no concurrent readers while updating opp_table */
        WARN_ON(!list_empty(&opp_table->opp_list));
 
-       if (opp_table->regulator_enabled) {
+       if (opp_table->enabled) {
                for (i = opp_table->regulator_count - 1; i >= 0; i--)
                        regulator_disable(opp_table->regulators[i]);
-
-               opp_table->regulator_enabled = false;
        }
 
        for (i = opp_table->regulator_count - 1; i >= 0; i--)

diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h
index e51646f..0c3de3f 100644 (file)
--- a/drivers/opp/opp.h
+++ b/drivers/opp/opp.h
@@ -147,11 +147,11 @@ enum opp_table_access {
  * @clk: Device's clock handle
  * @regulators: Supply regulators
  * @regulator_count: Number of power supply regulators. Its value can be -1
- * @regulator_enabled: Set to true if regulators were previously enabled.
  * (uninitialized), 0 (no opp-microvolt property) or > 0 (has opp-microvolt
  * property).
  * @paths: Interconnect path handles
  * @path_count: Number of interconnect paths
+ * @enabled: Set to true if the device's resources are enabled/configured.
  * @genpd_performance_state: Device's power domain support performance state.
  * @is_genpd: Marks if the OPP table belongs to a genpd.
  * @set_opp: Platform specific set_opp callback
@@ -195,9 +195,9 @@ struct opp_table {
        struct clk *clk;
        struct regulator **regulators;
        int regulator_count;
-       bool regulator_enabled;
        struct icc_path **paths;
        unsigned int path_count;
+       bool enabled;
        bool genpd_performance_state;
        bool is_genpd;