|
@@ -83,7 +83,7 @@ struct power_table {
|
|
|
* @dyn_power_table: array of struct power_table for frequency to power
|
|
|
* conversion, sorted in ascending order.
|
|
|
* @dyn_power_table_entries: number of entries in the @dyn_power_table array
|
|
|
- * @cpu_dev: the first cpu_device from @allowed_cpus that has OPPs registered
|
|
|
+ * @cpu_dev: the cpu_device of policy->cpu.
|
|
|
* @plat_get_static_power: callback to calculate the static power
|
|
|
*
|
|
|
* This structure is required for keeping information of each registered
|
|
@@ -207,24 +207,20 @@ static int build_dyn_power_table(struct cpufreq_cooling_device *cpufreq_cdev,
|
|
|
struct power_table *power_table;
|
|
|
struct dev_pm_opp *opp;
|
|
|
struct device *dev = NULL;
|
|
|
- int num_opps = 0, cpu, i, ret = 0;
|
|
|
+ int num_opps = 0, cpu = cpufreq_cdev->policy->cpu, i, ret = 0;
|
|
|
unsigned long freq;
|
|
|
|
|
|
- for_each_cpu(cpu, &cpufreq_cdev->allowed_cpus) {
|
|
|
- dev = get_cpu_device(cpu);
|
|
|
- if (!dev) {
|
|
|
- dev_warn(&cpufreq_cdev->cdev->device,
|
|
|
- "No cpu device for cpu %d\n", cpu);
|
|
|
- continue;
|
|
|
- }
|
|
|
-
|
|
|
- num_opps = dev_pm_opp_get_opp_count(dev);
|
|
|
- if (num_opps > 0)
|
|
|
- break;
|
|
|
- else if (num_opps < 0)
|
|
|
- return num_opps;
|
|
|
+ dev = get_cpu_device(cpu);
|
|
|
+ if (unlikely(!dev)) {
|
|
|
+ dev_warn(&cpufreq_cdev->cdev->device,
|
|
|
+ "No cpu device for cpu %d\n", cpu);
|
|
|
+ return -ENODEV;
|
|
|
}
|
|
|
|
|
|
+ num_opps = dev_pm_opp_get_opp_count(dev);
|
|
|
+ if (num_opps < 0)
|
|
|
+ return num_opps;
|
|
|
+
|
|
|
if (num_opps == 0)
|
|
|
return -EINVAL;
|
|
|
|