Unverified Commit 58e37bc2 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8045 drivers/perf: hisi: use cpuhp_state_remove_instance_nocalls() for... 

!8045  drivers/perf: hisi: use cpuhp_state_remove_instance_nocalls() for hisi_hns3_pmu uninit process

Merge Pull Request from: @ci-robot 
 
PR sync from: Cui GaoSheng <cuigaosheng1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/7S33XYE4IZZXPRDMSTMEBEFLRK2FSHNF/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RFL5 
 
Link:https://gitee.com/openeuler/kernel/pulls/8045

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 2215e29c 9a60d7a5

drivers/perf/hisilicon/hns3_pmu.c

+2 −2
Original line number Diff line number Diff line
@@ -1558,7 +1558,7 @@ static int hns3_pmu_init_pmu(struct pci_dev *pdev, struct hns3_pmu *hns3_pmu) 
	ret = perf_pmu_register(&hns3_pmu->pmu, hns3_pmu->pmu.name, -1);

	if (ret) {

		pci_err(pdev, "failed to register perf PMU, ret = %d.\n", ret);

		cpuhp_state_remove_instance(hns3_pmu_online, &hns3_pmu->node);

		cpuhp_state_remove_instance_nocalls(hns3_pmu_online, &hns3_pmu->node);

	}



	return ret;
@@ -1569,7 +1569,7 @@ static void hns3_pmu_uninit_pmu(struct pci_dev *pdev) 
	struct hns3_pmu *hns3_pmu = pci_get_drvdata(pdev);



	perf_pmu_unregister(&hns3_pmu->pmu);

	cpuhp_state_remove_instance(hns3_pmu_online, &hns3_pmu->node);

	cpuhp_state_remove_instance_nocalls(hns3_pmu_online, &hns3_pmu->node);

}



static int hns3_pmu_init_dev(struct pci_dev *pdev)