BackPup/Linux
1
0 Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-07 05:31:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

arm: perf: make of_pmu_irq_cfg take arm_pmu

Browse Source 
To support multiple PMUs we'll need to pass the arm_pmu instance around.
Update of_pmu_irq_cfg to take an arm_pmu, and acquire the platform
device from this.

Acked-by: Will Deacon <[email protected]>
Signed-off-by: Mark Rutland <[email protected]>
Signed-off-by: Will Deacon <[email protected]>
This commit is contained in:
Mark Rutland authored and Will Deacon committed 2015-05-27 16:12:36 +01:00
1 parent d06f23e763
commit 64d0d3943e
1 file changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/kernel/perf_event_cpu.c
+4 -3
View File
@@ -301,9 +301,10 @@ static int probe_current_pmu(struct arm_pmu *pmu)
return ret;
}
static int of_pmu_irq_cfg(struct platform_device *pdev)
static int of_pmu_irq_cfg(struct arm_pmu *pmu)
{
int i;
struct platform_device *pdev = pmu->plat_device;
int *irqs = kcalloc(pdev->num_resources, sizeof(*irqs), GFP_KERNEL);
if (!irqs)
@@ -336,7 +337,7 @@ static int of_pmu_irq_cfg(struct platform_device *pdev)
}
if (i == pdev->num_resources)
cpu_pmu->irq_affinity = irqs;
pmu->irq_affinity = irqs;
else
kfree(irqs);
@@ -368,7 +369,7 @@ static int cpu_pmu_device_probe(struct platform_device *pdev)
if (node && (of_id = of_match_node(cpu_pmu_of_device_ids, pdev->dev.of_node))) {
init_fn = of_id->data;
ret = of_pmu_irq_cfg(pdev);
ret = of_pmu_irq_cfg(pmu);
if (!ret)
ret = init_fn(pmu);
} else {