Commit 49785a77 authored by keliu's avatar keliu Committed by Will Deacon

drivers/perf: Directly use ida_alloc()/free()

Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .
Signed-off-by: default avatarkeliu <liuke94@huawei.com>
Link: https://lore.kernel.org/r/20220519080127.147030-1-liuke94@huawei.comSigned-off-by: default avatarWill Deacon <will@kernel.org>
parent a111daf0
...@@ -611,7 +611,7 @@ static int ddr_perf_init(struct ddr_pmu *pmu, void __iomem *base, ...@@ -611,7 +611,7 @@ static int ddr_perf_init(struct ddr_pmu *pmu, void __iomem *base,
.dev = dev, .dev = dev,
}; };
pmu->id = ida_simple_get(&ddr_ida, 0, 0, GFP_KERNEL); pmu->id = ida_alloc(&ddr_ida, GFP_KERNEL);
return pmu->id; return pmu->id;
} }
...@@ -765,7 +765,7 @@ static int ddr_perf_probe(struct platform_device *pdev) ...@@ -765,7 +765,7 @@ static int ddr_perf_probe(struct platform_device *pdev)
cpuhp_instance_err: cpuhp_instance_err:
cpuhp_remove_multi_state(pmu->cpuhp_state); cpuhp_remove_multi_state(pmu->cpuhp_state);
cpuhp_state_err: 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); dev_warn(&pdev->dev, "i.MX8 DDR Perf PMU failed (%d), disabled\n", ret);
return ret; return ret;
} }
...@@ -779,7 +779,7 @@ static int ddr_perf_remove(struct platform_device *pdev) ...@@ -779,7 +779,7 @@ static int ddr_perf_remove(struct platform_device *pdev)
perf_pmu_unregister(&pmu->pmu); perf_pmu_unregister(&pmu->pmu);
ida_simple_remove(&ddr_ida, pmu->id); ida_free(&ddr_ida, pmu->id);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment