Skip to content

Commit e7b1cc9

Browse files
lukaszluba-armrafaeljw
authored andcommitted
PM: EM: Extend em_cpufreq_update_efficiencies() argument list
In order to prepare the code for the modifiable EM perf_state table, make em_cpufreq_update_efficiencies() take a pointer to the EM table as its second argument and modify it to use that new argument instead of the 'table' member of dev->em_pd. No functional impact. Reviewed-by: Hongyan Xia <[email protected]> Reviewed-by: Dietmar Eggemann <[email protected]> Tested-by: Dietmar Eggemann <[email protected]> Signed-off-by: Lukasz Luba <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 4274521 commit e7b1cc9

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

kernel/power/energy_model.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -237,15 +237,15 @@ static int em_create_pd(struct device *dev, int nr_states,
237237
return 0;
238238
}
239239

240-
static void em_cpufreq_update_efficiencies(struct device *dev)
240+
static void
241+
em_cpufreq_update_efficiencies(struct device *dev, struct em_perf_state *table)
241242
{
242243
struct em_perf_domain *pd = dev->em_pd;
243-
struct em_perf_state *table;
244244
struct cpufreq_policy *policy;
245245
int found = 0;
246246
int i;
247247

248-
if (!_is_cpu_device(dev) || !pd)
248+
if (!_is_cpu_device(dev))
249249
return;
250250

251251
policy = cpufreq_cpu_get(cpumask_first(em_span_cpus(pd)));
@@ -254,8 +254,6 @@ static void em_cpufreq_update_efficiencies(struct device *dev)
254254
return;
255255
}
256256

257-
table = pd->table;
258-
259257
for (i = 0; i < pd->nr_perf_states; i++) {
260258
if (!(table[i].flags & EM_PERF_STATE_INEFFICIENT))
261259
continue;
@@ -397,7 +395,7 @@ int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,
397395

398396
dev->em_pd->flags |= flags;
399397

400-
em_cpufreq_update_efficiencies(dev);
398+
em_cpufreq_update_efficiencies(dev, dev->em_pd->table);
401399

402400
em_debug_create_pd(dev);
403401
dev_info(dev, "EM: created perf domain\n");

0 commit comments

Comments
 (0)