Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0305230a authored by Will Deacon's avatar Will Deacon
Browse files

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: default avatarWill Deacon <will.deacon@arm.com>
parent 288700d1

arch/arm/include/asm/pmu.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ struct arm_pmu { 


extern const struct dev_pm_ops armpmu_dev_pm_ops;



int armpmu_register(struct arm_pmu *armpmu, char *name, int type);

int armpmu_register(struct arm_pmu *armpmu, int type);



u64 armpmu_event_update(struct perf_event *event);

arch/arm/kernel/perf_event.c

+2 −2
Original line number Diff line number Diff line
@@ -511,12 +511,12 @@ static void __init armpmu_init(struct arm_pmu *armpmu) 
	};

}



int armpmu_register(struct arm_pmu *armpmu, char *name, int type)

int armpmu_register(struct arm_pmu *armpmu, int type)

{

	armpmu_init(armpmu);

	pr_info("enabled with %s PMU driver, %d counters available\n",

			armpmu->name, armpmu->num_events);

	return perf_pmu_register(&armpmu->pmu, name, type);

	return perf_pmu_register(&armpmu->pmu, armpmu->name, type);

}



/*

arch/arm/kernel/perf_event_cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ const char *perf_pmu_name(void) 
	if (!cpu_pmu)

		return NULL;



	return cpu_pmu->pmu.name;

	return cpu_pmu->name;

}

EXPORT_SYMBOL_GPL(perf_pmu_name);
@@ -287,7 +287,7 @@ static int __devinit cpu_pmu_device_probe(struct platform_device *pdev) 
	cpu_pmu = pmu;

	cpu_pmu->plat_device = pdev;

	cpu_pmu_init(cpu_pmu);

	armpmu_register(cpu_pmu, cpu_pmu->name, PERF_TYPE_RAW);

	armpmu_register(cpu_pmu, PERF_TYPE_RAW);



	return 0;

}