Commit 053b5579 authored by Junhao He's avatar Junhao He Committed by Will Deacon
Browse files

drivers/perf: hisi: Simplify the parameters of hisi_pmu_init() 



Use "hisi_pmu" to simplify the parameter list for the hisi_pmu_init()
function.

Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
Link: https://lore.kernel.org/r/20230119100307.3660-3-hejunhao3@huawei.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 7f95da9d

drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static int hisi_ddrc_pmu_probe(struct platform_device *pdev) 
				      "hisi_sccl%u_ddrc%u", ddrc_pmu->sccl_id,

				      ddrc_pmu->index_id);



	hisi_pmu_init(&ddrc_pmu->pmu, name, ddrc_pmu->pmu_events.attr_groups, THIS_MODULE);

	hisi_pmu_init(ddrc_pmu, name, THIS_MODULE);



	ret = perf_pmu_register(&ddrc_pmu->pmu, name, -1);

	if (ret) {

drivers/perf/hisilicon/hisi_uncore_hha_pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ static int hisi_hha_pmu_probe(struct platform_device *pdev) 


	name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "hisi_sccl%u_hha%u",

			      hha_pmu->sccl_id, hha_pmu->index_id);

	hisi_pmu_init(&hha_pmu->pmu, name, hha_pmu->pmu_events.attr_groups, THIS_MODULE);

	hisi_pmu_init(hha_pmu, name, THIS_MODULE);



	ret = perf_pmu_register(&hha_pmu->pmu, name, -1);

	if (ret) {

drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static int hisi_l3c_pmu_probe(struct platform_device *pdev) 
	 */

	name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "hisi_sccl%u_l3c%u",

			      l3c_pmu->sccl_id, l3c_pmu->ccl_id);

	hisi_pmu_init(&l3c_pmu->pmu, name, l3c_pmu->pmu_events.attr_groups, THIS_MODULE);

	hisi_pmu_init(l3c_pmu, name, THIS_MODULE);



	ret = perf_pmu_register(&l3c_pmu->pmu, name, -1);

	if (ret) {

drivers/perf/hisilicon/hisi_uncore_pa_pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ static int hisi_pa_pmu_probe(struct platform_device *pdev) 
		return ret;

	}



	hisi_pmu_init(&pa_pmu->pmu, name, pa_pmu->pmu_events.attr_groups, THIS_MODULE);

	hisi_pmu_init(pa_pmu, name, THIS_MODULE);

	ret = perf_pmu_register(&pa_pmu->pmu, name, -1);

	if (ret) {

		dev_err(pa_pmu->dev, "PMU register failed, ret = %d\n", ret);

drivers/perf/hisilicon/hisi_uncore_pmu.c

+5 −3
Original line number Diff line number Diff line
@@ -531,9 +531,11 @@ int hisi_uncore_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node) 
}

EXPORT_SYMBOL_GPL(hisi_uncore_pmu_offline_cpu);



void hisi_pmu_init(struct pmu *pmu, const char *name,

		const struct attribute_group **attr_groups, struct module *module)

void hisi_pmu_init(struct hisi_pmu *hisi_pmu, const char *name,

		   struct module *module)

{

	struct pmu *pmu = &hisi_pmu->pmu;



	pmu->name               = name;

	pmu->module             = module;

	pmu->task_ctx_nr        = perf_invalid_context;
@@ -545,7 +547,7 @@ void hisi_pmu_init(struct pmu *pmu, const char *name, 
	pmu->start              = hisi_uncore_pmu_start;

	pmu->stop               = hisi_uncore_pmu_stop;

	pmu->read               = hisi_uncore_pmu_read;

	pmu->attr_groups        = attr_groups;

	pmu->attr_groups        = hisi_pmu->pmu_events.attr_groups;

	pmu->capabilities       = PERF_PMU_CAP_NO_EXCLUDE;

}

EXPORT_SYMBOL_GPL(hisi_pmu_init);