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

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

arm_pmu: fold platform helpers into platform code 



The armpmu_{request,free}_irqs() helpers are only used by
arm_pmu_platform.c, so let's fold them in and make them static.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent c0248c96

drivers/perf/arm_pmu.c

+0 −21
Original line number Diff line number Diff line
@@ -534,14 +534,6 @@ void armpmu_free_irq(struct arm_pmu *armpmu, int cpu) 
	free_irq(irq, per_cpu_ptr(&hw_events->percpu_pmu, cpu));

}



void armpmu_free_irqs(struct arm_pmu *armpmu)

{

	int cpu;



	for_each_cpu(cpu, &armpmu->supported_cpus)

		armpmu_free_irq(armpmu, cpu);

}



int armpmu_request_irq(struct arm_pmu *armpmu, int cpu)

{

	int err = 0;
@@ -593,19 +585,6 @@ int armpmu_request_irq(struct arm_pmu *armpmu, int cpu) 
	return err;

}



int armpmu_request_irqs(struct arm_pmu *armpmu)

{

	int cpu, err;



	for_each_cpu(cpu, &armpmu->supported_cpus) {

		err = armpmu_request_irq(armpmu, cpu);

		if (err)

			break;

	}



	return err;

}



static int armpmu_get_cpu_irq(struct arm_pmu *pmu, int cpu)

{

	struct pmu_hw_events __percpu *hw_events = pmu->hw_events;

drivers/perf/arm_pmu_platform.c

+21 −0
Original line number Diff line number Diff line
@@ -164,6 +164,27 @@ static int pmu_parse_irqs(struct arm_pmu *pmu) 
	return 0;

}



static int armpmu_request_irqs(struct arm_pmu *armpmu)

{

	int cpu, err;



	for_each_cpu(cpu, &armpmu->supported_cpus) {

		err = armpmu_request_irq(armpmu, cpu);

		if (err)

			break;

	}



	return err;

}



static void armpmu_free_irqs(struct arm_pmu *armpmu)

{

	int cpu;



	for_each_cpu(cpu, &armpmu->supported_cpus)

		armpmu_free_irq(armpmu, cpu);

}



int arm_pmu_device_probe(struct platform_device *pdev,

			 const struct of_device_id *of_table,

			 const struct pmu_probe_info *probe_table)

include/linux/perf/arm_pmu.h

+0 −2
Original line number Diff line number Diff line
@@ -159,8 +159,6 @@ static inline int arm_pmu_acpi_probe(armpmu_init_fn init_fn) { return 0; } 
struct arm_pmu *armpmu_alloc(void);

void armpmu_free(struct arm_pmu *pmu);

int armpmu_register(struct arm_pmu *pmu);

int armpmu_request_irqs(struct arm_pmu *armpmu);

void armpmu_free_irqs(struct arm_pmu *armpmu);

int armpmu_request_irq(struct arm_pmu *armpmu, int cpu);

void armpmu_free_irq(struct arm_pmu *armpmu, int cpu);