summaryrefslogtreecommitdiff
path: root/drivers/perf
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2017-04-11 09:39:47 +0100
committerWill Deacon <will.deacon@arm.com>2017-04-11 16:29:53 +0100
commit74a2b3ea2d8c6c1f73103a0fcb50b5c214c0d864 (patch)
tree8ef66058c3066d15c9aac3b74cdab6234647896a /drivers/perf
parent70cd908a18f618577c449ad47988f4d442c9bc84 (diff)
drivers/perf: arm_pmu: factor out pmu registration
Currently arm_pmu_device_probe contains probing logic specific to the platform_device infrastructure, and some logic required to safely register the PMU with various systems. This patch factors out the logic relating to the registration of the PMU. This makes arm_pmu_device_probe a little easier to read, and will make it easier to reuse the logic for an ACPI-specific probing mechanism. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Tested-by: Jeremy Linton <jeremy.linton@arm.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/perf')
-rw-r--r--drivers/perf/arm_pmu.c40
1 files changed, 26 insertions, 14 deletions
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index 1cb8b1a1c122..985bd081f3e7 100644
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -982,6 +982,31 @@ static void armpmu_free(struct arm_pmu *pmu)
kfree(pmu);
}
+int armpmu_register(struct arm_pmu *pmu)
+{
+ int ret;
+
+ ret = cpu_pmu_init(pmu);
+ if (ret)
+ return ret;
+
+ ret = perf_pmu_register(&pmu->pmu, pmu->name, -1);
+ if (ret)
+ goto out_destroy;
+
+ if (!__oprofile_cpu_pmu)
+ __oprofile_cpu_pmu = pmu;
+
+ pr_info("enabled with %s PMU driver, %d counters available\n",
+ pmu->name, pmu->num_events);
+
+ return 0;
+
+out_destroy:
+ cpu_pmu_destroy(pmu);
+ return ret;
+}
+
int arm_pmu_device_probe(struct platform_device *pdev,
const struct of_device_id *of_table,
const struct pmu_probe_info *probe_table)
@@ -1025,25 +1050,12 @@ int arm_pmu_device_probe(struct platform_device *pdev,
goto out_free;
}
-
- ret = cpu_pmu_init(pmu);
+ ret = armpmu_register(pmu);
if (ret)
goto out_free;
- ret = perf_pmu_register(&pmu->pmu, pmu->name, -1);
- if (ret)
- goto out_destroy;
-
- if (!__oprofile_cpu_pmu)
- __oprofile_cpu_pmu = pmu;
-
- pr_info("enabled with %s PMU driver, %d counters available\n",
- pmu->name, pmu->num_events);
-
return 0;
-out_destroy:
- cpu_pmu_destroy(pmu);
out_free:
pr_info("%s: failed to register PMU devices!\n",
of_node_full_name(node));