| Message ID | 20220117090030.13064-1-miles.chen@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | clk: mediatek: add unregister logic to mtk_clk_simple_probe error path | expand |
Hi Stephen, > Stephen pointed out that there is no unregister logic in > mtk_clk_simple_probe() error path [1]. > Fix it by adding unregister logic to mtk_clk_simple_probe(). Chen-Yu's work [1] already addresses this problem. So please ignore this patch. [1] https://lore.kernel.org/lkml/20220122091731.283592-1-wenst@chromium.org/
Quoting Miles Chen (2022-01-23 21:20:38) > Hi Stephen, > > > Stephen pointed out that there is no unregister logic in > > mtk_clk_simple_probe() error path [1]. > > Fix it by adding unregister logic to mtk_clk_simple_probe(). > > Chen-Yu's work [1] already addresses this problem. So please ignore > this patch. Alright. Thanks.
diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c index 8d5791b3f460..edf21975cb4d 100644 --- a/drivers/clk/mediatek/clk-mtk.c +++ b/drivers/clk/mediatek/clk-mtk.c @@ -161,6 +161,22 @@ int mtk_clk_register_gates(struct device_node *node, } EXPORT_SYMBOL_GPL(mtk_clk_register_gates); +static void mtk_clk_unregister_gates(const struct mtk_gate *clks, + int num, struct clk_onecell_data *clk_data) +{ + int i; + const struct mtk_gate *gate; + struct clk *clk; + + for (i = 0; i < num; i++) { + gate = &clks[i]; + clk = clk_data->clks[gate->id]; + + if (!IS_ERR_OR_NULL(clk)) + clk_unregister(clk); + } +} + struct clk *mtk_clk_register_composite(const struct mtk_composite *mc, void __iomem *base, spinlock_t *lock) { @@ -320,15 +336,17 @@ int mtk_clk_simple_probe(struct platform_device *pdev) r = mtk_clk_register_gates(node, mcd->clks, mcd->num_clks, clk_data); if (r) - goto free_data; + goto err_free_data; r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data); if (r) - goto free_data; + goto err_unregister_gates; return r; -free_data: +err_unregister_gates: + mtk_clk_unregister_gates(mcd->clks, mcd->num_clks, clk_data); +err_free_data: mtk_free_clk_data(clk_data); return r; }
Stephen pointed out that there is no unregister logic in mtk_clk_simple_probe() error path [1]. Fix it by adding unregister logic to mtk_clk_simple_probe(). [1] https://lore.kernel.org/linux-mediatek/20220114221930.660B5C36AE9@smtp.kernel.org/ Fixes: c58cd0e40ffa ("clk: mediatek: Add mtk_clk_simple_probe() to simplify clock providers") Cc: Stephen Boyd <sboyd@kernel.org> Signed-off-by: Miles Chen <miles.chen@mediatek.com> --- drivers/clk/mediatek/clk-mtk.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)