ARM: 8352/1: perf: Fix the pmu node name in warning message
authorWill Deacon <will.deacon@arm.com>
Fri, 1 May 2015 16:16:01 +0000 (17:16 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 3 May 2015 22:23:44 +0000 (23:23 +0100)
With commit 9fd85eb502a7 ("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: 9fd85eb502a7 (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>
arch/arm/kernel/perf_event_cpu.c

index becf7ad6eddc4c0ef8b567dff173e9e304fa8ebb..213919ba326fbad35bd356b19bc0c0546cbc70b1 100644 (file)
@@ -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;
                }