2 files changed, 14 insertions, 20 deletions

diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
index 4c7c6da7a989..2824d3a5e9f0 100644
--- a/drivers/base/power/opp/core.c
+++ b/drivers/base/power/opp/core.c
@@ -1316,7 +1316,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_put_prop_name);
  * that this function is *NOT* called under RCU protection or in contexts where
  * mutex cannot be locked.
  */
-int dev_pm_opp_set_regulator(struct device *dev, const char *name)
+struct opp_table *dev_pm_opp_set_regulator(struct device *dev, const char *name)
 {
         struct opp_table *opp_table;
         struct regulator *reg;
@@ -1354,20 +1354,20 @@ int dev_pm_opp_set_regulator(struct device *dev, const char *name)
         opp_table->regulator = reg;
 
         mutex_unlock(&opp_table_lock);
-        return 0;
+        return opp_table;
 
 err:
         _remove_opp_table(opp_table);
 unlock:
         mutex_unlock(&opp_table_lock);
 
-        return ret;
+        return ERR_PTR(ret);
 }
 EXPORT_SYMBOL_GPL(dev_pm_opp_set_regulator);
 
 /**
  * dev_pm_opp_put_regulator() - Releases resources blocked for regulator
- * @dev: Device for which regulator was set.
+ * @opp_table: OPP table returned from dev_pm_opp_set_regulator().
  *
  * Locking: The internal opp_table and opp structures are RCU protected.
  * Hence this function internally uses RCU updater strategy with mutex locks
@@ -1375,22 +1375,12 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_set_regulator);
  * that this function is *NOT* called under RCU protection or in contexts where
  * mutex cannot be locked.
  */
-void dev_pm_opp_put_regulator(struct device *dev)
+void dev_pm_opp_put_regulator(struct opp_table *opp_table)
 {
-        struct opp_table *opp_table;
-
         mutex_lock(&opp_table_lock);
 
-        /* Check for existing table for 'dev' first */
-        opp_table = _find_opp_table(dev);
-        if (IS_ERR(opp_table)) {
-                dev_err(dev, "Failed to find opp_table: %ld\n",
-                        PTR_ERR(opp_table));
-                goto unlock;
-        }
-
         if (IS_ERR(opp_table->regulator)) {
-                dev_err(dev, "%s: Doesn't have regulator set\n", __func__);
+                pr_err("%s: Doesn't have regulator set\n", __func__);
                 goto unlock;
         }
 
diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
index 5c07ae05d69a..4d3ec92cbabf 100644
--- a/drivers/cpufreq/cpufreq-dt.c
+++ b/drivers/cpufreq/cpufreq-dt.c
@@ -28,6 +28,7 @@
 #include "cpufreq-dt.h"
 
 struct private_data {
+        struct opp_table *opp_table;
         struct device *cpu_dev;
         struct thermal_cooling_device *cdev;
         const char *reg_name;
@@ -143,6 +144,7 @@ static int resources_available(void)
 static int cpufreq_init(struct cpufreq_policy *policy)
 {
         struct cpufreq_frequency_table *freq_table;
+        struct opp_table *opp_table = NULL;
         struct private_data *priv;
         struct device *cpu_dev;
         struct clk *cpu_clk;
@@ -186,8 +188,9 @@ static int cpufreq_init(struct cpufreq_policy *policy)
          */
         name = find_supply_name(cpu_dev);
         if (name) {
-                ret = dev_pm_opp_set_regulator(cpu_dev, name);
-                if (ret) {
+                opp_table = dev_pm_opp_set_regulator(cpu_dev, name);
+                if (IS_ERR(opp_table)) {
+                        ret = PTR_ERR(opp_table);
                         dev_err(cpu_dev, "Failed to set regulator for cpu%d: %d\n",
                                 policy->cpu, ret);
                         goto out_put_clk;
@@ -237,6 +240,7 @@ static int cpufreq_init(struct cpufreq_policy *policy)
         }
 
         priv->reg_name = name;
+        priv->opp_table = opp_table;
 
         ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table);
         if (ret) {
@@ -285,7 +289,7 @@ out_free_priv:
 out_free_opp:
         dev_pm_opp_of_cpumask_remove_table(policy->cpus);
         if (name)
-                dev_pm_opp_put_regulator(cpu_dev);
+                dev_pm_opp_put_regulator(opp_table);
 out_put_clk:
         clk_put(cpu_clk);
 
@@ -300,7 +304,7 @@ static int cpufreq_exit(struct cpufreq_policy *policy)
         dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
         dev_pm_opp_of_cpumask_remove_table(policy->related_cpus);
         if (priv->reg_name)
-                dev_pm_opp_put_regulator(priv->cpu_dev);
+                dev_pm_opp_put_regulator(priv->opp_table);
 
         clk_put(policy->clk);
         kfree(priv);