Skip to content

Commit

Permalink
infiniband: ehca: Fix compiler warnings
Browse files Browse the repository at this point in the history
Fix comp_task() to return void to match smp_hotplug_thread's thread_fn
member, and adjust indirection on the ->cpu_comp_threads per-CPU
member of the ehca_comp_pool structure.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
  • Loading branch information
Paul E. McKenney authored and Paul E. McKenney committed Aug 20, 2012
1 parent c0e12e5 commit bff4a39
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/infiniband/hw/ehca/ehca_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ static void queue_comp_task(struct ehca_cq *__cq)
BUG_ON(!cpu_online(cpu_id));

cct = per_cpu_ptr(pool->cpu_comp_tasks, cpu_id);
thread = per_cpu_ptr(pool->cpu_comp_threads, cpu_id);
thread = *per_cpu_ptr(pool->cpu_comp_threads, cpu_id);
BUG_ON(!cct || !thread);

spin_lock_irqsave(&cct->task_lock, flags);
Expand All @@ -716,7 +716,7 @@ static void queue_comp_task(struct ehca_cq *__cq)
if (cq_jobs > 0) {
cpu_id = find_next_online_cpu(pool);
cct = per_cpu_ptr(pool->cpu_comp_tasks, cpu_id);
thread = per_cpu_ptr(pool->cpu_comp_threads, cpu_id);
thread = *per_cpu_ptr(pool->cpu_comp_threads, cpu_id);
BUG_ON(!cct || !thread);
}
__queue_comp_task(__cq, cct, thread);
Expand Down Expand Up @@ -761,7 +761,7 @@ static void comp_task_park(unsigned int cpu)

cpu = find_next_online_cpu(pool);
target = per_cpu_ptr(pool->cpu_comp_tasks, cpu);
thread = per_cpu_ptr(pool->cpu_comp_threads, cpu);
thread = *per_cpu_ptr(pool->cpu_comp_threads, cpu);
spin_lock_irq(&target->task_lock);
list_for_each_entry_safe(cq, tmp, &list, entry) {
list_del(&cq->entry);
Expand All @@ -788,7 +788,7 @@ static int comp_task_should_run(unsigned int cpu)
return cct->cq_jobs;
}

static int comp_task(unsigned int cpu)
static void comp_task(unsigned int cpu)
{
struct ehca_cpu_comp_task *cct = this_cpu_ptr(pool->cpu_comp_tasks);
int cql_empty;
Expand Down

0 comments on commit bff4a39

Please sign in to comment.