X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=drivers%2Fperf%2Farm-cmn.c;h=400eb7f579dcebabddea19d6ce043d401c50aeec;hb=37092df65a4e853d24a6b916b46c6f2ef27fa2e6;hp=bc3cba5f8c5dc72e1d8998d604f8083a5998582c;hpb=1e7b5812f4890ad84058bbb6c4a5deddfb2c5b25;p=platform%2Fkernel%2Flinux-rpi.git

diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
index bc3cba5..400eb7f 100644
--- a/drivers/perf/arm-cmn.c
+++ b/drivers/perf/arm-cmn.c
@@ -1561,7 +1561,8 @@ static int arm_cmn_probe(struct platform_device *pdev)
 
 	err = perf_pmu_register(&cmn->pmu, name, -1);
 	if (err)
-		cpuhp_state_remove_instance(arm_cmn_hp_state, &cmn->cpuhp_node);
+		cpuhp_state_remove_instance_nocalls(arm_cmn_hp_state, &cmn->cpuhp_node);
+
 	return err;
 }
 
@@ -1572,7 +1573,7 @@ static int arm_cmn_remove(struct platform_device *pdev)
 	writel_relaxed(0, cmn->dtc[0].base + CMN_DT_DTC_CTL);
 
 	perf_pmu_unregister(&cmn->pmu);
-	cpuhp_state_remove_instance(arm_cmn_hp_state, &cmn->cpuhp_node);
+	cpuhp_state_remove_instance_nocalls(arm_cmn_hp_state, &cmn->cpuhp_node);
 	return 0;
 }