From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 5 Oct 2020 11:31:32 +0000 (+0200)
Subject: Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=757e282188f0138a06ebf925c950995feb7bd666;p=linux.git

Merge branch 'opp/linux-next' of git://git./linux/kernel/git/vireshk/pm

Pull opertaing performance points (OPP) framework fixes for 5.10-rc1
from Viresh Kumar:

"- Return -EPROBE_DEFER properly from dev_pm_opp_get_opp_table()
   (Stephan Gerhold).

 - Minor cleanups around required-opps (Stephan Gerhold).

 - Extends opp-supported-hw property to contain multiple versions
   (Viresh Kumar).

 - Multiple cleanups around dev_pm_opp_attach_genpd() (Viresh Kumar).

 - Multiple fixes, cleanups in the OPP core for overall better design
   (Viresh Kumar)."

* 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  opp: Allow opp-level to be set to 0
  opp: Prevent memory leak in dev_pm_opp_attach_genpd()
  ARM: tegra: Pass multiple versions in opp-supported-hw property
  opp: Allow opp-supported-hw to contain multiple versions
  dt-bindings: opp: Allow opp-supported-hw to contain multiple versions
  opp: Set required OPPs in reverse order when scaling down
  opp: Reduce code duplication in _set_required_opps()
  opp: Drop unnecessary check from dev_pm_opp_attach_genpd()
  opp: Handle multiple calls for same OPP table in _of_add_opp_table_v1()
  opp: Allow dev_pm_opp_get_opp_table() to return -EPROBE_DEFER
  opp: Remove _dev_pm_opp_find_and_remove_table() wrapper
  opp: Split out _opp_set_rate_zero()
  opp: Reuse the enabled flag in !target_freq path
  opp: Rename regulator_enabled and use it as status of all resources
---

757e282188f0138a06ebf925c950995feb7bd666
diff --cc drivers/opp/core.c
index 3ca7543142bf3,8d047300d001d..2483e765318a3
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@@ -2431,17 -2441,8 +2454,5 @@@ void dev_pm_opp_remove_table(struct dev
  
  	/* Drop reference taken by _find_opp_table() */
  	dev_pm_opp_put_opp_table(opp_table);
 -
 -	/* Drop reference taken while the OPP table was added */
 -	dev_pm_opp_put_opp_table(opp_table);
  }
- 
- /**
-  * dev_pm_opp_remove_table() - Free all OPPs associated with the device
-  * @dev:	device pointer used to lookup OPP table.
-  *
-  * Free both OPPs created using static entries present in DT and the
-  * dynamically added entries.
-  */
- void dev_pm_opp_remove_table(struct device *dev)
- {
- 	_dev_pm_opp_find_and_remove_table(dev);
- }
  EXPORT_SYMBOL_GPL(dev_pm_opp_remove_table);