Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9274c892 authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

PM / OPP: Rename and split _dev_pm_opp_remove_table() 



Later patches would want to remove OPP table (and its OPPs) using the
opp_table pointer instead of 'dev'.

In order to prepare for that, rename _dev_pm_opp_remove_table() as
_dev_pm_opp_find_and_remove_table() split out part of it.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 969fceb3

drivers/base/power/opp/core.c

+22 −13
Original line number Diff line number Diff line
@@ -1888,11 +1888,29 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_notifier); 
 * Free OPPs either created using static entries present in DT or even the

 * dynamically added entries based on remove_all param.

 */

void _dev_pm_opp_remove_table(struct device *dev, bool remove_all)

static void _dev_pm_opp_remove_table(struct opp_table *opp_table,

				     struct device *dev, bool remove_all)

{

	struct opp_table *opp_table;

	struct dev_pm_opp *opp, *tmp;



	opp_rcu_lockdep_assert();



	/* Find if opp_table manages a single device */

	if (list_is_singular(&opp_table->dev_list)) {

		/* Free static OPPs */

		list_for_each_entry_safe(opp, tmp, &opp_table->opp_list, node) {

			if (remove_all || !opp->dynamic)

				_opp_remove(opp_table, opp);

		}

	} else {

		_remove_opp_dev(_find_opp_dev(dev, opp_table), opp_table);

	}

}



void _dev_pm_opp_find_and_remove_table(struct device *dev, bool remove_all)

{

	struct opp_table *opp_table;



	/* Hold our table modification lock here */

	mutex_lock(&opp_table_lock);
@@ -1909,16 +1927,7 @@ void _dev_pm_opp_remove_table(struct device *dev, bool remove_all) 
		goto unlock;

	}



	/* Find if opp_table manages a single device */

	if (list_is_singular(&opp_table->dev_list)) {

		/* Free static OPPs */

		list_for_each_entry_safe(opp, tmp, &opp_table->opp_list, node) {

			if (remove_all || !opp->dynamic)

				_opp_remove(opp_table, opp);

		}

	} else {

		_remove_opp_dev(_find_opp_dev(dev, opp_table), opp_table);

	}

	_dev_pm_opp_remove_table(opp_table, dev, remove_all);



unlock:

	mutex_unlock(&opp_table_lock);
@@ -1939,6 +1948,6 @@ void _dev_pm_opp_remove_table(struct device *dev, bool remove_all) 
 */

void dev_pm_opp_remove_table(struct device *dev)

{

	_dev_pm_opp_remove_table(dev, true);

	_dev_pm_opp_find_and_remove_table(dev, true);

}

EXPORT_SYMBOL_GPL(dev_pm_opp_remove_table);

drivers/base/power/opp/of.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev, 
 */

void dev_pm_opp_of_remove_table(struct device *dev)

{

	_dev_pm_opp_remove_table(dev, false);

	_dev_pm_opp_find_and_remove_table(dev, false);

}

EXPORT_SYMBOL_GPL(dev_pm_opp_of_remove_table);

drivers/base/power/opp/opp.h

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ struct opp_table { 
/* Routines internal to opp core */

struct opp_table *_find_opp_table(struct device *dev);

struct opp_device *_add_opp_dev(const struct device *dev, struct opp_table *opp_table);

void _dev_pm_opp_remove_table(struct device *dev, bool remove_all);

void _dev_pm_opp_find_and_remove_table(struct device *dev, bool remove_all);

struct dev_pm_opp *_opp_allocate(struct device *dev, struct opp_table **opp_table);

void _opp_free(struct dev_pm_opp *opp, struct opp_table *opp_table);

int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, struct opp_table *opp_table);