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

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

PM / OPP: Rename routines specific to old bindings with _v1 



Clearly distinguish routines based on what version of bindings they
parse. We have already postfixed routines properly with _v2 for new
bindings. Postfix the older ones now with _v1.

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 d6d2a528

drivers/base/power/opp/core.c

+5 −5
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ static int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, 
}



/**

 * _opp_add_dynamic() - Allocate a dynamic OPP.

 * _opp_add_v1() - Allocate a OPP based on v1 bindings.

 * @dev:	device for which we do this operation

 * @freq:	Frequency in Hz for this OPP

 * @u_volt:	Voltage in uVolts for this OPP
@@ -729,8 +729,8 @@ static int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, 
 *		Duplicate OPPs (both freq and volt are same) and !opp->available

 * -ENOMEM	Memory allocation failure

 */

static int _opp_add_dynamic(struct device *dev, unsigned long freq,

			    long u_volt, bool dynamic)

static int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt,

		       bool dynamic)

{

	struct device_opp *dev_opp;

	struct dev_pm_opp *new_opp;
@@ -934,7 +934,7 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np) 
 */

int dev_pm_opp_add(struct device *dev, unsigned long freq, unsigned long u_volt)

{

	return _opp_add_dynamic(dev, freq, u_volt, true);

	return _opp_add_v1(dev, freq, u_volt, true);

}

EXPORT_SYMBOL_GPL(dev_pm_opp_add);
@@ -1236,7 +1236,7 @@ static int _of_add_opp_table_v1(struct device *dev) 
		unsigned long freq = be32_to_cpup(val++) * 1000;

		unsigned long volt = be32_to_cpup(val++);



		if (_opp_add_dynamic(dev, freq, volt, false))

		if (_opp_add_v1(dev, freq, volt, false))

			dev_warn(dev, "%s: Failed to add OPP %ld\n",

				 __func__, freq);

		nr -= 2;