Commit 8bdac14b authored Jun 10, 2022 by Viresh Kumar

OPP: Reuse _opp_compare_key() in _opp_add_static_v2()



Reuse _opp_compare_key() in _opp_add_static_v2() instead of just
comparing frequency while finding suspend frequency. Also add a comment
over _opp_compare_key() explaining its return values.

Tested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

parent 4768914b

drivers/opp/core.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1636,6 +1636,12 @@ static bool _opp_supported_by_regulators(struct dev_pm_opp *opp,
		return true;
		}

		/*
		* Returns
		* 0: opp1 == opp2
		* 1: opp1 > opp2
		* -1: opp1 < opp2
		*/
		int _opp_compare_key(struct dev_pm_opp opp1, struct dev_pm_opp opp2)
		{
		if (opp1->rate != opp2->rate)

drivers/opp/of.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -929,8 +929,8 @@ static struct dev_pm_opp _opp_add_static_v2(struct opp_table opp_table,
		/* OPP to select on device suspend */
		if (of_property_read_bool(np, "opp-suspend")) {
		if (opp_table->suspend_opp) {
		/* Pick the OPP with higher rate as suspend OPP */
		if (new_opp->rate > opp_table->suspend_opp->rate) {
		/* Pick the OPP with higher rate/bw/level as suspend OPP */
		if (_opp_compare_key(new_opp, opp_table->suspend_opp) == 1) {
		opp_table->suspend_opp->suspend = false;
		new_opp->suspend = true;
		opp_table->suspend_opp = new_opp;