Commit f2963c7e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-opp' 

* pm-opp:
  opp: Drop empty-table checks from _put functions
  opp: remove WARN when no valid OPPs remain
parents a87a1096 0da04f88

drivers/opp/core.c

+0 −15
Original line number Diff line number Diff line
@@ -1856,9 +1856,6 @@ void dev_pm_opp_put_supported_hw(struct opp_table *opp_table) 
	if (unlikely(!opp_table))

		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);

	opp_table->supported_hw = NULL;

	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))

		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);

	opp_table->prop_name = NULL;
@@ -2056,9 +2050,6 @@ void dev_pm_opp_put_regulators(struct opp_table *opp_table) 
	if (!opp_table->regulators)

		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) {

		for (i = opp_table->regulator_count - 1; i >= 0; 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))

		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);

	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))

		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;



	mutex_lock(&opp_table->lock);

drivers/opp/of.c

+3 −2
Original line number Diff line number Diff line
@@ -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 */

	if (WARN_ON(!count)) {

	/* There should be one or more OPPs defined */

	if (!count) {

		dev_err(dev, "%s: no supported OPPs", __func__);

		ret = -ENOENT;

		goto remove_static_opp;

	}