Commit f3e690b0 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Stephen Boyd
Browse files

clk: mediatek: mt8195: Implement error handling in probe functions 



Until now the mediatek clk driver library did not have any way to
unregister clks, and so all drivers did not do proper cleanup in
their error paths.

Now that the library does have APIs to unregister clks, use them
in the error path of the probe functions for the mt8195 clk drivers
to do proper cleanup.

Signed-off-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20220208124034.414635-30-wenst@chromium.org


Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent cd3a77a0

drivers/clk/mediatek/clk-mt8195-apmixedsys.c

+10 −3
Original line number Diff line number Diff line
@@ -120,17 +120,24 @@ static int clk_mt8195_apmixed_probe(struct platform_device *pdev) 
	if (!clk_data)

		return -ENOMEM;



	mtk_clk_register_plls(node, plls, ARRAY_SIZE(plls), clk_data);

	r = mtk_clk_register_gates(node, apmixed_clks, ARRAY_SIZE(apmixed_clks), clk_data);

	r = mtk_clk_register_plls(node, plls, ARRAY_SIZE(plls), clk_data);

	if (r)

		goto free_apmixed_data;



	r = mtk_clk_register_gates(node, apmixed_clks, ARRAY_SIZE(apmixed_clks), clk_data);

	if (r)

		goto unregister_plls;



	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

	if (r)

		goto free_apmixed_data;

		goto unregister_gates;



	return r;



unregister_gates:

	mtk_clk_unregister_gates(apmixed_clks, ARRAY_SIZE(apmixed_clks), clk_data);

unregister_plls:

	mtk_clk_unregister_plls(plls, ARRAY_SIZE(plls), clk_data);

free_apmixed_data:

	mtk_free_clk_data(clk_data);

	return r;

drivers/clk/mediatek/clk-mt8195-apusys_pll.c

+7 −2
Original line number Diff line number Diff line
@@ -66,13 +66,18 @@ static int clk_mt8195_apusys_pll_probe(struct platform_device *pdev) 
	if (!clk_data)

		return -ENOMEM;



	mtk_clk_register_plls(node, apusys_plls, ARRAY_SIZE(apusys_plls), clk_data);

	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

	r = mtk_clk_register_plls(node, apusys_plls, ARRAY_SIZE(apusys_plls), clk_data);

	if (r)

		goto free_apusys_pll_data;



	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

	if (r)

		goto unregister_plls;



	return r;



unregister_plls:

	mtk_clk_unregister_plls(apusys_plls, ARRAY_SIZE(apusys_plls), clk_data);

free_apusys_pll_data:

	mtk_free_clk_data(clk_data);

	return r;

drivers/clk/mediatek/clk-mt8195-topckgen.c

+38 −11
Original line number Diff line number Diff line
@@ -1239,25 +1239,52 @@ static int clk_mt8195_topck_probe(struct platform_device *pdev) 
		goto free_top_data;

	}



	mtk_clk_register_fixed_clks(top_fixed_clks, ARRAY_SIZE(top_fixed_clks),

	r = mtk_clk_register_fixed_clks(top_fixed_clks, ARRAY_SIZE(top_fixed_clks),

					top_clk_data);

	mtk_clk_register_factors(top_divs, ARRAY_SIZE(top_divs), top_clk_data);

	mtk_clk_register_muxes(top_mtk_muxes, ARRAY_SIZE(top_mtk_muxes), node,

	if (r)

		goto free_top_data;



	r = mtk_clk_register_factors(top_divs, ARRAY_SIZE(top_divs), top_clk_data);

	if (r)

		goto unregister_fixed_clks;



	r = mtk_clk_register_muxes(top_mtk_muxes, ARRAY_SIZE(top_mtk_muxes), node,

				   &mt8195_clk_lock, top_clk_data);

	mtk_clk_register_composites(top_muxes, ARRAY_SIZE(top_muxes), base,

	if (r)

		goto unregister_factors;



	r = mtk_clk_register_composites(top_muxes, ARRAY_SIZE(top_muxes), base,

					&mt8195_clk_lock, top_clk_data);

	mtk_clk_register_composites(top_adj_divs, ARRAY_SIZE(top_adj_divs), base,

	if (r)

		goto unregister_muxes;



	r = mtk_clk_register_composites(top_adj_divs, ARRAY_SIZE(top_adj_divs), base,

					&mt8195_clk_lock, top_clk_data);

	if (r)

		goto unregister_composite_muxes;



	r = mtk_clk_register_gates(node, top_clks, ARRAY_SIZE(top_clks), top_clk_data);

	if (r)

		goto free_top_data;

		goto unregister_composite_divs;



	r = of_clk_add_provider(node, of_clk_src_onecell_get, top_clk_data);

	if (r)

		goto free_top_data;

		goto unregister_gates;



	return r;



unregister_gates:

	mtk_clk_unregister_gates(top_clks, ARRAY_SIZE(top_clks), top_clk_data);

unregister_composite_divs:

	mtk_clk_unregister_composites(top_adj_divs, ARRAY_SIZE(top_adj_divs), top_clk_data);

unregister_composite_muxes:

	mtk_clk_unregister_composites(top_muxes, ARRAY_SIZE(top_muxes), top_clk_data);

unregister_muxes:

	mtk_clk_unregister_muxes(top_mtk_muxes, ARRAY_SIZE(top_mtk_muxes), top_clk_data);

unregister_factors:

	mtk_clk_unregister_factors(top_divs, ARRAY_SIZE(top_divs), top_clk_data);

unregister_fixed_clks:

	mtk_clk_unregister_fixed_clks(top_fixed_clks, ARRAY_SIZE(top_fixed_clks), top_clk_data);

free_top_data:

	mtk_free_clk_data(top_clk_data);

	return r;

drivers/clk/mediatek/clk-mt8195-vdo0.c

+3 −1
Original line number Diff line number Diff line
@@ -105,10 +105,12 @@ static int clk_mt8195_vdo0_probe(struct platform_device *pdev) 


	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

	if (r)

		goto free_vdo0_data;

		goto unregister_gates;



	return r;



unregister_gates:

	mtk_clk_unregister_gates(vdo0_clks, ARRAY_SIZE(vdo0_clks), clk_data);

free_vdo0_data:

	mtk_free_clk_data(clk_data);

	return r;

drivers/clk/mediatek/clk-mt8195-vdo1.c

+3 −1
Original line number Diff line number Diff line
@@ -122,10 +122,12 @@ static int clk_mt8195_vdo1_probe(struct platform_device *pdev) 


	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

	if (r)

		goto free_vdo1_data;

		goto unregister_gates;



	return r;



unregister_gates:

	mtk_clk_unregister_gates(vdo1_clks, ARRAY_SIZE(vdo1_clks), clk_data);

free_vdo1_data:

	mtk_free_clk_data(clk_data);

	return r;