diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-02 00:49:05 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-02 00:49:05 +0100 |
| commit | c6f48119a1771c078dce0fca3ede77cd0062e2e4 (patch) | |
| tree | 8f21aa9b5f1cd736722ba0d58d6c6b3eaf4b6ff8 | |
| parent | cpufreq: Simplify core code related to boost support (diff) | |
| parent | PM / OPP: Set cpu_dev->id in cpumask first (diff) | |
| download | linux-c6f48119a1771c078dce0fca3ede77cd0062e2e4.tar.xz linux-c6f48119a1771c078dce0fca3ede77cd0062e2e4.zip | |
Merge branch 'pm-opp' into pm-cpufreq
| -rw-r--r-- | drivers/base/power/opp/core.c | 4 | ||||
| -rw-r--r-- | drivers/base/power/opp/cpu.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c index 5c01fec1ed14..cd230c63aee6 100644 --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c @@ -814,7 +814,7 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev, if (!prop) { /* Search for "opp-microvolt" */ - name[13] = '\0'; + sprintf(name, "opp-microvolt"); prop = of_find_property(opp->np, name, NULL); /* Missing property isn't a problem, but an invalid entry is */ @@ -855,7 +855,7 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev, if (!prop) { /* Search for "opp-microamp" */ - name[12] = '\0'; + sprintf(name, "opp-microamp"); prop = of_find_property(opp->np, name, NULL); } diff --git a/drivers/base/power/opp/cpu.c b/drivers/base/power/opp/cpu.c index 7b445e88a0d5..9f0c15570f64 100644 --- a/drivers/base/power/opp/cpu.c +++ b/drivers/base/power/opp/cpu.c @@ -214,7 +214,6 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_of_cpumask_add_table); /* * Works only for OPP v2 bindings. * - * cpumask should be already set to mask of cpu_dev->id. * Returns -ENOENT if operating-points-v2 bindings aren't supported. */ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask) @@ -230,6 +229,8 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask return -ENOENT; } + cpumask_set_cpu(cpu_dev->id, cpumask); + /* OPPs are shared ? */ if (!of_property_read_bool(np, "opp-shared")) goto put_cpu_node; |