drivers/perf: Directly use ida_alloc()/free()
PATCH 1/2 drivers/perf: Directly use ida_alloc()/free()
Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .
Signed-off-by keliu <[email protected]>
--- drivers/perf/fsl_imx8_ddr_perf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/perf/fsl_imx8_ddr_perf.c +3 -3
@@ -611,7 +611,7 @@ static int ddr_perf_init(struct ddr_pmu *pmu, void __iomem *base, .dev = dev, }; - pmu->id =ida_simple_get (&ddr_ida,0 ,0 ,GFP_KERNEL ); + pmu->id =ida_alloc (&ddr_ida,GFP_KERNEL );return pmu->id; }
@@ -765,7 +765,7 @@ static int ddr_perf_probe(struct platform_device *pdev) cpuhp_instance_err:cpuhp_remove_multi_state (pmu->cpuhp_state); cpuhp_state_err: -ida_simple_remove (&ddr_ida, pmu->id); +ida_free (&ddr_ida, pmu->id);dev_warn (&pdev->dev,"i.MX8 DDR Perf PMU failed (%d), disabled\n" , ret);return ret; }
@@ -779,7 +779,7 @@ static int ddr_perf_remove(struct platform_device *pdev)perf_pmu_unregister (&pmu->pmu); -ida_simple_remove (&ddr_ida, pmu->id); +ida_free (&ddr_ida, pmu->id);return 0 ; }
Signature · 1 line
2.25.1
PATCH 2/2 drivers/perf:Directly use ida_alloc()/free()
Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .
Signed-off-by keliu <[email protected]>
--- drivers/perf/arm-ccn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/perf/arm-ccn.c +3 -3
@@ -1250,7 +1250,7 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn) ccn->dt.cmp_mask[CCN_IDX_MASK_OPCODE ].h = ~(0x1f <<9 );/* Get a convenient /sys/event_source/devices/ name */ - ccn->dt.id =ida_simple_get (&arm_ccn_pmu_ida,0 ,0 ,GFP_KERNEL ); + ccn->dt.id =ida_alloc (&arm_ccn_pmu_ida,GFP_KERNEL );if (ccn->dt.id ==0 ) { name ="ccn" ; }else {
@@ -1312,7 +1312,7 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn) &ccn->dt.node); error_set_affinity: error_choose_name: -ida_simple_remove (&arm_ccn_pmu_ida, ccn->dt.id); +ida_free (&arm_ccn_pmu_ida, ccn->dt.id);for (i =0 ; i < ccn->num_xps; i++)writel (0 , ccn->xp[i].base +CCN_XP_DT_CONTROL );writel (0 , ccn->dt.base +CCN_DT_PMCR );
@@ -1329,7 +1329,7 @@ static void arm_ccn_pmu_cleanup(struct arm_ccn *ccn)writel (0 , ccn->xp[i].base +CCN_XP_DT_CONTROL );writel (0 , ccn->dt.base +CCN_DT_PMCR );perf_pmu_unregister (&ccn->dt.pmu); -ida_simple_remove (&arm_ccn_pmu_ida, ccn->dt.id); +ida_free (&arm_ccn_pmu_ida, ccn->dt.id); } static int arm_ccn_for_each_valid_region(struct arm_ccn *ccn,
Signature · 1 line
2.25.1
Quoted 4 lines · keliu
Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .
Applied to will (for-next/perf), thanks!
[1/2] drivers/perf: Directly use ida_alloc()/free()
https://git.kernel.org/will/c/49785a77780c [2/2] drivers/perf:Directly use ida_alloc()/free() https://git.kernel.org/will/c/a336916b067c
Cheers,
Signature · 10 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel