Skip to content

Commit

Permalink
thermal/intel_powerclamp: Remove duplicated code that starts the kthread
Browse files Browse the repository at this point in the history
This patch removes code duplication. It does not modify
the functionality.

Signed-off-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Petr Mladek authored and Rafael J. Wysocki committed Nov 29, 2016
1 parent c1de45c commit 14f3f7d
Showing 1 changed file with 20 additions and 25 deletions.
45 changes: 20 additions & 25 deletions drivers/thermal/intel_powerclamp.c
Original file line number Diff line number Diff line change
Expand Up @@ -508,10 +508,27 @@ static void poll_pkg_cstate(struct work_struct *dummy)
schedule_delayed_work(&poll_pkg_cstate_work, HZ);
}

static void start_power_clamp_thread(unsigned long cpu)
{
struct task_struct **p = per_cpu_ptr(powerclamp_thread, cpu);
struct task_struct *thread;

thread = kthread_create_on_node(clamp_thread,
(void *) cpu,
cpu_to_node(cpu),
"kidle_inject/%ld", cpu);
if (IS_ERR(thread))
return;

/* bind to cpu here */
kthread_bind(thread, cpu);
wake_up_process(thread);
*p = thread;
}

static int start_power_clamp(void)
{
unsigned long cpu;
struct task_struct *thread;

set_target_ratio = clamp(set_target_ratio, 0U, MAX_TARGET_RATIO - 1);
/* prevent cpu hotplug */
Expand All @@ -527,20 +544,7 @@ static int start_power_clamp(void)

/* start one thread per online cpu */
for_each_online_cpu(cpu) {
struct task_struct **p =
per_cpu_ptr(powerclamp_thread, cpu);

thread = kthread_create_on_node(clamp_thread,
(void *) cpu,
cpu_to_node(cpu),
"kidle_inject/%ld", cpu);
/* bind to cpu here */
if (likely(!IS_ERR(thread))) {
kthread_bind(thread, cpu);
wake_up_process(thread);
*p = thread;
}

start_power_clamp_thread(cpu);
}
put_online_cpus();

Expand Down Expand Up @@ -572,7 +576,6 @@ static int powerclamp_cpu_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
unsigned long cpu = (unsigned long)hcpu;
struct task_struct *thread;
struct task_struct **percpu_thread =
per_cpu_ptr(powerclamp_thread, cpu);

Expand All @@ -581,15 +584,7 @@ static int powerclamp_cpu_callback(struct notifier_block *nfb,

switch (action) {
case CPU_ONLINE:
thread = kthread_create_on_node(clamp_thread,
(void *) cpu,
cpu_to_node(cpu),
"kidle_inject/%lu", cpu);
if (likely(!IS_ERR(thread))) {
kthread_bind(thread, cpu);
wake_up_process(thread);
*percpu_thread = thread;
}
start_power_clamp_thread(cpu);
/* prefer BSP as controlling CPU */
if (cpu == 0) {
control_cpu = 0;
Expand Down

0 comments on commit 14f3f7d

Please sign in to comment.