Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a5a89d3 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

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: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 74a2b3ea

drivers/perf/arm_pmu.c

+3 −2
Original line number Diff line number Diff line
@@ -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;