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

Merge tag 'opp-updates-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm 

Pull OPP updates for 7.0 from Viresh Kumar:

"- Return correct value in dev_pm_opp_get_level (Aleks Todorov).

 - Use scoped for each OF child loop (Krzysztof Kozlowski)."

* tag 'opp-updates-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  OPP: Return correct value in dev_pm_opp_get_level
  OPP: of: Simplify with scoped for each OF child loop
parents 63804fed 0b7277e0

drivers/opp/core.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ unsigned int dev_pm_opp_get_level(struct dev_pm_opp *opp) 
{

	if (IS_ERR_OR_NULL(opp) || !opp->available) {

		pr_err("%s: Invalid parameters\n", __func__);

		return 0;

		return U32_MAX;

	}



	return opp->level;

drivers/opp/of.c

+1 −3
Original line number Diff line number Diff line
@@ -956,7 +956,6 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table, 
/* Initializes OPP tables based on new bindings */

static int _of_add_opp_table_v2(struct device *dev, struct opp_table *opp_table)

{

	struct device_node *np;

	int ret, count = 0;

	struct dev_pm_opp *opp;
@@ -971,13 +970,12 @@ static int _of_add_opp_table_v2(struct device *dev, struct opp_table *opp_table) 
	}



	/* We have opp-table node now, iterate over it and add OPPs */

	for_each_available_child_of_node(opp_table->np, np) {

	for_each_available_child_of_node_scoped(opp_table->np, np) {

		opp = _opp_add_static_v2(opp_table, dev, np);

		if (IS_ERR(opp)) {

			ret = PTR_ERR(opp);

			dev_err(dev, "%s: Failed to add OPP, %d\n", __func__,

				ret);

			of_node_put(np);

			goto remove_static_opp;

		} else if (opp) {

			count++;