sched/fair: use *p to reference task_structs

This is a simple renaming patch which just align to the most common code
convention used in fair.c, task_structs pointers are usually named *p.

Change-Id: Id0769e52b6a271014d89353fdb4be9bb721b5b2f
Signed-off-by: Patrick Bellasi <patrick.bellasi@arm.com>
Signed-off-by: Chris Redpath <chris.redpath@arm.com>
Signed-off-by: Quentin Perret <quentin.perret@arm.com>
This commit is contained in:
Chris Redpath
2017-09-12 14:48:29 +01:00
committed by Quentin Perret
parent 225006a4f7
commit e997bf0fde

View File

@@ -5439,7 +5439,7 @@ struct energy_env {
int trg_cpu;
int energy;
int payoff;
struct task_struct *task;
struct task_struct *p;
struct {
int before;
int after;
@@ -5485,7 +5485,7 @@ static unsigned long group_max_util(struct energy_env *eenv)
int cpu;
for_each_cpu(cpu, sched_group_cpus(eenv->sg_cap)) {
util = cpu_util_wake(cpu, eenv->task);
util = cpu_util_wake(cpu, eenv->p);
/*
* If we are looking at the target CPU specified by the eenv,
@@ -5520,7 +5520,7 @@ long group_norm_util(struct energy_env *eenv, struct sched_group *sg)
int cpu;
for_each_cpu(cpu, sched_group_cpus(sg)) {
util = cpu_util_wake(cpu, eenv->task);
util = cpu_util_wake(cpu, eenv->p);
/*
* If we are looking at the target CPU specified by the eenv,
@@ -5582,7 +5582,7 @@ static int group_idle_state(struct energy_env *eenv, struct sched_group *sg)
* achievable when we move the task.
*/
for_each_cpu(i, sched_group_cpus(sg)) {
grp_util += cpu_util_wake(i, eenv->task);
grp_util += cpu_util_wake(i, eenv->p);
if (unlikely(i == eenv->trg_cpu))
grp_util += eenv->util_delta;
}
@@ -5741,13 +5741,13 @@ static inline int __energy_diff(struct energy_env *eenv)
int diff, margin;
struct energy_env eenv_before = {
.util_delta = task_util(eenv->task),
.util_delta = task_util(eenv->p),
.src_cpu = eenv->src_cpu,
.dst_cpu = eenv->dst_cpu,
.trg_cpu = eenv->src_cpu,
.nrg = { 0, 0, 0, 0},
.cap = { 0, 0, 0 },
.task = eenv->task,
.p = eenv->p,
};
if (eenv->src_cpu == eenv->dst_cpu)
@@ -5784,7 +5784,7 @@ static inline int __energy_diff(struct energy_env *eenv)
eenv->nrg.diff = eenv->nrg.after - eenv->nrg.before;
eenv->payoff = 0;
#ifndef CONFIG_SCHED_TUNE
trace_sched_energy_diff(eenv->task,
trace_sched_energy_diff(eenv->p,
eenv->src_cpu, eenv->dst_cpu, eenv->util_delta,
eenv->nrg.before, eenv->nrg.after, eenv->nrg.diff,
eenv->cap.before, eenv->cap.after, eenv->cap.delta,
@@ -5848,7 +5848,7 @@ normalize_energy(int energy_diff)
static inline int
energy_diff(struct energy_env *eenv)
{
int boost = schedtune_task_boost(eenv->task);
int boost = schedtune_task_boost(eenv->p);
int nrg_delta;
/* Conpute "absolute" energy diff */
@@ -5856,7 +5856,7 @@ energy_diff(struct energy_env *eenv)
/* Return energy diff when boost margin is 0 */
if (boost == 0) {
trace_sched_energy_diff(eenv->task,
trace_sched_energy_diff(eenv->p,
eenv->src_cpu, eenv->dst_cpu, eenv->util_delta,
eenv->nrg.before, eenv->nrg.after, eenv->nrg.diff,
eenv->cap.before, eenv->cap.after, eenv->cap.delta,
@@ -5871,9 +5871,9 @@ energy_diff(struct energy_env *eenv)
eenv->payoff = schedtune_accept_deltas(
eenv->nrg.delta,
eenv->cap.delta,
eenv->task);
eenv->p);
trace_sched_energy_diff(eenv->task,
trace_sched_energy_diff(eenv->p,
eenv->src_cpu, eenv->dst_cpu, eenv->util_delta,
eenv->nrg.before, eenv->nrg.after, eenv->nrg.diff,
eenv->cap.before, eenv->cap.after, eenv->cap.delta,
@@ -6000,7 +6000,7 @@ static inline unsigned long task_util(struct task_struct *p)
return p->se.avg.util_avg;
}
static inline unsigned long boosted_task_util(struct task_struct *task);
static inline unsigned long boosted_task_util(struct task_struct *p);
static inline bool __task_fits(struct task_struct *p, int cpu, int util)
{
@@ -6077,16 +6077,16 @@ schedtune_cpu_margin(unsigned long util, int cpu)
}
static inline long
schedtune_task_margin(struct task_struct *task)
schedtune_task_margin(struct task_struct *p)
{
int boost = schedtune_task_boost(task);
int boost = schedtune_task_boost(p);
unsigned long util;
long margin;
if (boost == 0)
return 0;
util = task_util(task);
util = task_util(p);
margin = schedtune_margin(util, boost);
return margin;
@@ -6101,7 +6101,7 @@ schedtune_cpu_margin(unsigned long util, int cpu)
}
static inline int
schedtune_task_margin(struct task_struct *task)
schedtune_task_margin(struct task_struct *p)
{
return 0;
}
@@ -6120,12 +6120,12 @@ boosted_cpu_util(int cpu)
}
static inline unsigned long
boosted_task_util(struct task_struct *task)
boosted_task_util(struct task_struct *p)
{
unsigned long util = task_util(task);
long margin = schedtune_task_margin(task);
unsigned long util = task_util(p);
long margin = schedtune_task_margin(p);
trace_sched_boost_task(task, util, margin);
trace_sched_boost_task(p, util, margin);
return util + margin;
}
@@ -7042,8 +7042,8 @@ static int select_energy_cpu_brute(struct task_struct *p, int prev_cpu, int sync
.util_delta = task_util(p),
.src_cpu = prev_cpu,
.dst_cpu = target_cpu,
.task = p,
.trg_cpu = target_cpu,
.p = p,
.trg_cpu = target_cpu,
};