From 3a5a89d30ee3d5d8b55490e3c63bf533b196e1c8 Mon Sep 17 00:00:00 2001 From: Mark Rutland Date: Tue, 11 Apr 2017 09:39:48 +0100 Subject: drivers/perf: arm_pmu: simplify cpu_pmu_request_irqs() 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 Tested-by: Jeremy Linton Cc: Will Deacon Signed-off-by: Will Deacon --- drivers/perf/arm_pmu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/perf') diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index 985bd08..183c6fd 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -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); @@ -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; -- cgit v1.1