PM / OPP: Rename _allocate_opp() to _opp_allocate()

Make the naming consistent with how other routines are named.

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>

diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
index a8a5e01b77561715664ce578c656c3858da725a5..422482575954da02380450975ed0644207d317bd 100644 (file)
--- a/drivers/base/power/opp/core.c
+++ b/drivers/base/power/opp/core.c
@@ -1014,7 +1014,7 @@ unlock:
 }
 EXPORT_SYMBOL_GPL(dev_pm_opp_remove);
 
-struct dev_pm_opp *_allocate_opp(struct device *dev,
+struct dev_pm_opp *_opp_allocate(struct device *dev,
                                 struct opp_table **opp_table)
 {
        struct dev_pm_opp *opp;
@@ -1167,7 +1167,7 @@ int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt,
        /* Hold our table modification lock here */
        mutex_lock(&opp_table_lock);
 
-       new_opp = _allocate_opp(dev, &opp_table);
+       new_opp = _opp_allocate(dev, &opp_table);
        if (!new_opp) {
                ret = -ENOMEM;
                goto unlock;

diff --git a/drivers/base/power/opp/of.c b/drivers/base/power/opp/of.c
index 996ca3b42f473156502876fe32876bebd84e6812..f8512ca2bf41495004ef3f5f1c25599e04a33cf1 100644 (file)
--- a/drivers/base/power/opp/of.c
+++ b/drivers/base/power/opp/of.c
@@ -287,7 +287,7 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np)
        /* Hold our table modification lock here */
        mutex_lock(&opp_table_lock);
 
-       new_opp = _allocate_opp(dev, &opp_table);
+       new_opp = _opp_allocate(dev, &opp_table);
        if (!new_opp) {
                ret = -ENOMEM;
                goto unlock;

diff --git a/drivers/base/power/opp/opp.h b/drivers/base/power/opp/opp.h
index af9f2b849a66c3de5c3f7f67ce9ea87d25d5376d..0f23a105960529e91ca906a6e8eba9dbd55f0405 100644 (file)
--- a/drivers/base/power/opp/opp.h
+++ b/drivers/base/power/opp/opp.h
@@ -193,7 +193,7 @@ struct opp_table {
 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);
-struct dev_pm_opp *_allocate_opp(struct device *dev, struct opp_table **opp_table);
+struct dev_pm_opp *_opp_allocate(struct device *dev, struct opp_table **opp_table);
 int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, struct opp_table *opp_table);
 void _opp_remove(struct opp_table *opp_table, struct dev_pm_opp *opp, bool notify);
 int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt, bool dynamic);