Skip to content

Commit

Permalink
drivers/perf: arm_pmu: simplify cpu_pmu_request_irqs()
Browse files Browse the repository at this point in the history
The ARM PMU framework code always uses armpmu_dispatch_irq as its common
IRQ handler. Passing this down from cpu_pmu_init() is somewhat
pointless, and gets in the way of refactoring.

This patch makes cpu_pmu_request_irqs() always use armpmu_dispatch_irq
as the handler when requesting IRQs, and removes the handler parameter
from its prototype.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Jeremy Linton <jeremy.linton@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
  • Loading branch information
Mark Rutland authored and Will Deacon committed Apr 11, 2017
1 parent 74a2b3e commit 3a5a89d
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/perf/arm_pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -543,10 +543,11 @@ static void cpu_pmu_free_irqs(struct arm_pmu *cpu_pmu)
}
}

static int cpu_pmu_request_irqs(struct arm_pmu *cpu_pmu, irq_handler_t handler)
static int cpu_pmu_request_irqs(struct arm_pmu *cpu_pmu)
{
int cpu, err;
struct pmu_hw_events __percpu *hw_events = cpu_pmu->hw_events;
const irq_handler_t handler = armpmu_dispatch_irq;

for_each_cpu(cpu, &cpu_pmu->supported_cpus) {
int irq = per_cpu(hw_events->irq, cpu);
Expand Down Expand Up @@ -735,7 +736,7 @@ static int cpu_pmu_init(struct arm_pmu *cpu_pmu)
{
int err;

err = cpu_pmu_request_irqs(cpu_pmu, armpmu_dispatch_irq);
err = cpu_pmu_request_irqs(cpu_pmu);
if (err)
goto out;

Expand Down

0 comments on commit 3a5a89d

Please sign in to comment.