GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 08:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'pm-opp'

Browse source 
* pm-opp:
  opp: Drop empty-table checks from _put functions
  opp: remove WARN when no valid OPPs remain
This commit is contained in:
Rafael J. Wysocki 2021-08-20 21:11:16 +02:00
commit f2963c7ec7
2 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/opp/core.c
View file

@ -1856,9 +1856,6 @@ void dev_pm_opp_put_supported_hw(struct opp_table *opp_table)
if (unlikely(!opp_table)) if (unlikely(!opp_table))
return; return;
/* Make sure there are no concurrent readers while updating opp_table */
WARN_ON(!list_empty(&opp_table->opp_list));
kfree(opp_table->supported_hw); kfree(opp_table->supported_hw);
opp_table->supported_hw = NULL; opp_table->supported_hw = NULL;
opp_table->supported_hw_count = 0; opp_table->supported_hw_count = 0;
@ -1944,9 +1941,6 @@ void dev_pm_opp_put_prop_name(struct opp_table *opp_table)
if (unlikely(!opp_table)) if (unlikely(!opp_table))
return; return;
/* Make sure there are no concurrent readers while updating opp_table */
WARN_ON(!list_empty(&opp_table->opp_list));
kfree(opp_table->prop_name); kfree(opp_table->prop_name);
opp_table->prop_name = NULL; opp_table->prop_name = NULL;
@ -2056,9 +2050,6 @@ void dev_pm_opp_put_regulators(struct opp_table *opp_table)
if (!opp_table->regulators) if (!opp_table->regulators)
goto put_opp_table; goto put_opp_table;
/* Make sure there are no concurrent readers while updating opp_table */
WARN_ON(!list_empty(&opp_table->opp_list));
if (opp_table->enabled) { if (opp_table->enabled) {
for (i = opp_table->regulator_count - 1; i >= 0; i--) for (i = opp_table->regulator_count - 1; i >= 0; i--)
regulator_disable(opp_table->regulators[i]); regulator_disable(opp_table->regulators[i]);
@ -2178,9 +2169,6 @@ void dev_pm_opp_put_clkname(struct opp_table *opp_table)
if (unlikely(!opp_table)) if (unlikely(!opp_table))
return; return;
/* Make sure there are no concurrent readers while updating opp_table */
WARN_ON(!list_empty(&opp_table->opp_list));
clk_put(opp_table->clk); clk_put(opp_table->clk);
opp_table->clk = ERR_PTR(-EINVAL); opp_table->clk = ERR_PTR(-EINVAL);
@ -2279,9 +2267,6 @@ void dev_pm_opp_unregister_set_opp_helper(struct opp_table *opp_table)
if (unlikely(!opp_table)) if (unlikely(!opp_table))
return; return;
/* Make sure there are no concurrent readers while updating opp_table */
WARN_ON(!list_empty(&opp_table->opp_list));
opp_table->set_opp = NULL; opp_table->set_opp = NULL;
mutex_lock(&opp_table->lock); mutex_lock(&opp_table->lock);

5
drivers/opp/of.c
View file

@ -964,8 +964,9 @@ static int _of_add_opp_table_v2(struct device *dev, struct opp_table *opp_table)
} }
} }
/* There should be one of more OPP defined */ /* There should be one or more OPPs defined */
if (WARN_ON(!count)) { if (!count) {
dev_err(dev, "%s: no supported OPPs", __func__);
ret = -ENOENT; ret = -ENOENT;
goto remove_static_opp; goto remove_static_opp;
} }