diff options
author | Will Deacon <will.deacon@arm.com> | 2012-09-21 09:23:47 -0400 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2012-11-09 06:37:26 -0500 |
commit | 0305230a3d92d6829db89c9e0c096d4d8733f317 (patch) | |
tree | 30720e24df940feccf3e8fc03ddfb65d08751f83 /arch/arm/kernel/perf_event.c | |
parent | 288700d16d4c1479aa00e3db13caed8bb7c83e9f (diff) |
ARM: perf: consistently use arm_pmu->name for PMU name
Perf has three ways to name a PMU: either by passing an explicit char *,
reading arm_pmu->name or accessing arm_pmu->pmu.name.
Just use arm_pmu->name consistently in the ARM backend.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/kernel/perf_event.c')
-rw-r--r-- | arch/arm/kernel/perf_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c index 1cfa3f35713e..1243deda5bbb 100644 --- a/arch/arm/kernel/perf_event.c +++ b/arch/arm/kernel/perf_event.c | |||
@@ -511,12 +511,12 @@ static void __init armpmu_init(struct arm_pmu *armpmu) | |||
511 | }; | 511 | }; |
512 | } | 512 | } |
513 | 513 | ||
514 | int armpmu_register(struct arm_pmu *armpmu, char *name, int type) | 514 | int armpmu_register(struct arm_pmu *armpmu, int type) |
515 | { | 515 | { |
516 | armpmu_init(armpmu); | 516 | armpmu_init(armpmu); |
517 | pr_info("enabled with %s PMU driver, %d counters available\n", | 517 | pr_info("enabled with %s PMU driver, %d counters available\n", |
518 | armpmu->name, armpmu->num_events); | 518 | armpmu->name, armpmu->num_events); |
519 | return perf_pmu_register(&armpmu->pmu, name, type); | 519 | return perf_pmu_register(&armpmu->pmu, armpmu->name, type); |
520 | } | 520 | } |
521 | 521 | ||
522 | /* | 522 | /* |