Commit 29bcf6cd authored by Junhao He's avatar Junhao He Committed by Ma Wupeng
Browse files

drivers/perf: hisi: Remove redundant initialized of pmu->name 

mainline inclusion
from mainline-v6.4-rc1
commit 25d8c250
category: cleanup
bugzilla: https://gitee.com/openeuler/kernel/issues/I77IH6
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=25d8c25025a46e7621edde2eb6d5f55c6d29ee86



----------------------------------------------------------------------

"pmu->name" is initialized by perf_pmu_register() function, so remove
the redundant initialized in hisi_pmu_init().

Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
parent b46e60f4

drivers/perf/hisilicon/hisi_uncore_cpa_pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int hisi_cpa_pmu_probe(struct platform_device *pdev) 
	if (!name)

		return -ENOMEM;



	hisi_pmu_init(cpa_pmu, name, THIS_MODULE);

	hisi_pmu_init(cpa_pmu, THIS_MODULE);



	/* Power Management should be disabled before using CPA PMU. */

	hisi_cpa_pmu_disable_pm(cpa_pmu);

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, name, THIS_MODULE);

	hisi_pmu_init(ddrc_pmu, 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, name, THIS_MODULE);

	hisi_pmu_init(hha_pmu, 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, name, THIS_MODULE);

	hisi_pmu_init(l3c_pmu, 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, name, THIS_MODULE);

	hisi_pmu_init(pa_pmu, 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);