p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PM / OPP: Don't create copy of regulators unnecessarily 

This code was required while the OPP core was managed with help of RCUs,
but not anymore. Get rid of unnecessary alloc/memcpy operations.

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>
This commit is contained in:
Viresh Kumar 2017-05-23 09:32:11 +05:30 committed by Rafael J. Wysocki
parent c74b32fadc
commit 478256bddb
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/base/power/opp/core.c
View File

@ -180,7 +180,7 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)
{ {
struct opp_table *opp_table; struct opp_table *opp_table;
struct dev_pm_opp *opp; struct dev_pm_opp *opp;
struct regulator *reg, **regulators; struct regulator *reg;
unsigned long latency_ns = 0; unsigned long latency_ns = 0;
int ret, i, count; int ret, i, count;
struct { struct {
@ -198,15 +198,9 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)
if (!count) if (!count)
goto put_opp_table; goto put_opp_table;
regulators = kmalloc_array(count, sizeof(*regulators), GFP_KERNEL);
if (!regulators)
goto put_opp_table;
uV = kmalloc_array(count, sizeof(*uV), GFP_KERNEL); uV = kmalloc_array(count, sizeof(*uV), GFP_KERNEL);
if (!uV) if (!uV)
goto free_regulators; goto put_opp_table;
memcpy(regulators, opp_table->regulators, count * sizeof(*regulators));
mutex_lock(&opp_table->lock); mutex_lock(&opp_table->lock);
@ -232,15 +226,13 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)
* isn't freed, while we are executing this routine. * isn't freed, while we are executing this routine.
*/ */
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
reg = regulators[i]; reg = opp_table->regulators[i];
ret = regulator_set_voltage_time(reg, uV[i].min, uV[i].max); ret = regulator_set_voltage_time(reg, uV[i].min, uV[i].max);
if (ret > 0) if (ret > 0)
latency_ns += ret * 1000; latency_ns += ret * 1000;
} }
kfree(uV); kfree(uV);
free_regulators:
kfree(regulators);
put_opp_table: put_opp_table:
dev_pm_opp_put_opp_table(opp_table); dev_pm_opp_put_opp_table(opp_table);