ARM: 8352/1: perf: Fix the pmu node name in warning message

wildea01 · Russell King · commit 3b8786ff7a1b · 2015-05-03T23:23:44.000+01:00
With commit 9fd85eb ("ARM: pmu: add support for interrupt-affinity property"), we print a warning when we find a PMU SPI with a missing missing interrupt-affinity property in a pmu node. Unfortunately, we pass the wrong (NULL) device node to of_node_full_name, resulting in unhelpful messages such as: hw perfevents: Failed to parse <no-node>/interrupt-affinity[0] This patch fixes the name to that of the pmu node. Fixes: 9fd85eb (ARM: pmu: add support for interrupt-affinity property) Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c
@@ -322,7 +322,7 @@ static int of_pmu_irq_cfg(struct platform_device *pdev)
 				      i);
 		if (!dn) {
 			pr_warn("Failed to parse %s/interrupt-affinity[%d]\n",
-				of_node_full_name(dn), i);
+				of_node_full_name(pdev->dev.of_node), i);
 			break;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ static int of_pmu_irq_cfg(struct platform_device *pdev)`
`322`	`322`	`i);`
`323`	`323`	`if (!dn) {`
`324`	`324`	`pr_warn("Failed to parse %s/interrupt-affinity[%d]\n",`
`325`		`- of_node_full_name(dn), i);`
	`325`	`+ of_node_full_name(pdev->dev.of_node), i);`
`326`	`326`	`break;`
`327`	`327`	`}`
`328`	`328`