aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2015-10-15 12:12:44 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-11-01 19:48:48 -0500
commitb64b9c3f900a0522fb926f1436088e2e36807594 (patch)
tree8f15487e9e7f2965b1c835b9fc0f0df7c319db0e
parentd6d2a5289a530a3020703e6a3b19a14668601c27 (diff)
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: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/base/power/opp/core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
index 60ae6f029499..ca70e281614b 100644
--- a/drivers/base/power/opp/core.c
+++ b/drivers/base/power/opp/core.c
@@ -703,7 +703,7 @@ static int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,
703} 703}
704 704
705/** 705/**
706 * _opp_add_dynamic() - Allocate a dynamic OPP. 706 * _opp_add_v1() - Allocate a OPP based on v1 bindings.
707 * @dev: device for which we do this operation 707 * @dev: device for which we do this operation
708 * @freq: Frequency in Hz for this OPP 708 * @freq: Frequency in Hz for this OPP
709 * @u_volt: Voltage in uVolts for this OPP 709 * @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,
729 * Duplicate OPPs (both freq and volt are same) and !opp->available 729 * Duplicate OPPs (both freq and volt are same) and !opp->available
730 * -ENOMEM Memory allocation failure 730 * -ENOMEM Memory allocation failure
731 */ 731 */
732static int _opp_add_dynamic(struct device *dev, unsigned long freq, 732static int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt,
733 long u_volt, bool dynamic) 733 bool dynamic)
734{ 734{
735 struct device_opp *dev_opp; 735 struct device_opp *dev_opp;
736 struct dev_pm_opp *new_opp; 736 struct dev_pm_opp *new_opp;
@@ -934,7 +934,7 @@ unlock:
934 */ 934 */
935int dev_pm_opp_add(struct device *dev, unsigned long freq, unsigned long u_volt) 935int dev_pm_opp_add(struct device *dev, unsigned long freq, unsigned long u_volt)
936{ 936{
937 return _opp_add_dynamic(dev, freq, u_volt, true); 937 return _opp_add_v1(dev, freq, u_volt, true);
938} 938}
939EXPORT_SYMBOL_GPL(dev_pm_opp_add); 939EXPORT_SYMBOL_GPL(dev_pm_opp_add);
940 940
@@ -1236,7 +1236,7 @@ static int _of_add_opp_table_v1(struct device *dev)
1236 unsigned long freq = be32_to_cpup(val++) * 1000; 1236 unsigned long freq = be32_to_cpup(val++) * 1000;
1237 unsigned long volt = be32_to_cpup(val++); 1237 unsigned long volt = be32_to_cpup(val++);
1238 1238
1239 if (_opp_add_dynamic(dev, freq, volt, false)) 1239 if (_opp_add_v1(dev, freq, volt, false))
1240 dev_warn(dev, "%s: Failed to add OPP %ld\n", 1240 dev_warn(dev, "%s: Failed to add OPP %ld\n",
1241 __func__, freq); 1241 __func__, freq);
1242 nr -= 2; 1242 nr -= 2;