From: Miles Chen <miles.chen@mediatek.com>
To: <wenst@chromium.org>
Cc: <chun-jie.chen@mediatek.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-clk@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-mediatek@lists.infradead.org>, <matthias.bgg@gmail.com>,
<mturquette@baylibre.com>, <sboyd@kernel.org>
Subject: Re: [PATCH 29/31] clk: mediatek: mt8195: Implement error handling in probe functions
Date: Wed, 26 Jan 2022 16:37:41 +0800 [thread overview]
Message-ID: <20220126083741.18563-1-miles.chen@mediatek.com> (raw)
In-Reply-To: <20220122091731.283592-30-wenst@chromium.org>
> 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: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: Miles Chen <miles.chen@mediatek.com>
> ---
> drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 13 ++++--
> drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 11 ++++-
> drivers/clk/mediatek/clk-mt8195-topckgen.c | 49 +++++++++++++++-----
> drivers/clk/mediatek/clk-mt8195-vdo0.c | 4 +-
> drivers/clk/mediatek/clk-mt8195-vdo1.c | 4 +-
> 5 files changed, 63 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/clk/mediatek/clk-mt8195-apmixedsys.c b/drivers/clk/mediatek/clk-mt8195-apmixedsys.c
> index 5b1b7dc447eb..af8d80f25f30 100644
> --- a/drivers/clk/mediatek/clk-mt8195-apmixedsys.c
> +++ b/drivers/clk/mediatek/clk-mt8195-apmixedsys.c
> @@ -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_register_gates(node, apmixed_clks, ARRAY_SIZE(apmixed_clks), clk_data);
> +unregister_plls:
> + mtk_clk_register_plls(node, plls, ARRAY_SIZE(plls), clk_data);
> free_apmixed_data:
> mtk_free_clk_data(clk_data);
> return r;
> diff --git a/drivers/clk/mediatek/clk-mt8195-apusys_pll.c b/drivers/clk/mediatek/clk-mt8195-apusys_pll.c
> index db449ff877d7..1fff6f3d2dc7 100644
> --- a/drivers/clk/mediatek/clk-mt8195-apusys_pll.c
> +++ b/drivers/clk/mediatek/clk-mt8195-apusys_pll.c
> @@ -66,13 +66,20 @@ 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;
> +
> + platform_set_drvdata(pdev, clk_data);
> +
> 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;
> diff --git a/drivers/clk/mediatek/clk-mt8195-topckgen.c b/drivers/clk/mediatek/clk-mt8195-topckgen.c
> index 3e2aba9c40bb..3631f49a5e5a 100644
> --- a/drivers/clk/mediatek/clk-mt8195-topckgen.c
> +++ b/drivers/clk/mediatek/clk-mt8195-topckgen.c
> @@ -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),
> - 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,
> - &mt8195_clk_lock, top_clk_data);
> - 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,
> - &mt8195_clk_lock, top_clk_data);
> - r = mtk_clk_register_gates(node, top_clks, ARRAY_SIZE(top_clks), top_clk_data);
> + r = mtk_clk_register_fixed_clks(top_fixed_clks, ARRAY_SIZE(top_fixed_clks),
> + top_clk_data);
> 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);
> + if (r)
> + goto unregister_factors;
> +
> + r = mtk_clk_register_composites(top_muxes, ARRAY_SIZE(top_muxes), base,
> + &mt8195_clk_lock, top_clk_data);
> + 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 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;
> diff --git a/drivers/clk/mediatek/clk-mt8195-vdo0.c b/drivers/clk/mediatek/clk-mt8195-vdo0.c
> index f7ff7618c714..af34eb564b1d 100644
> --- a/drivers/clk/mediatek/clk-mt8195-vdo0.c
> +++ b/drivers/clk/mediatek/clk-mt8195-vdo0.c
> @@ -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;
> diff --git a/drivers/clk/mediatek/clk-mt8195-vdo1.c b/drivers/clk/mediatek/clk-mt8195-vdo1.c
> index 03df8eae8838..6b502bbc730c 100644
> --- a/drivers/clk/mediatek/clk-mt8195-vdo1.c
> +++ b/drivers/clk/mediatek/clk-mt8195-vdo1.c
> @@ -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;
> --
> 2.35.0.rc0.227.g00780c9af4-goog
>
>
next prev parent reply other threads:[~2022-01-26 8:37 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-22 9:17 [PATCH 00/31] clk: mediatek: Cleanups and Improvements - Part 1 Chen-Yu Tsai
2022-01-22 9:17 ` [PATCH 01/31] clk: mediatek: Use %pe to print errors Chen-Yu Tsai
2022-01-22 9:17 ` [PATCH 02/31] clk: mediatek: gate: Consolidate gate type clk related code Chen-Yu Tsai
2022-01-24 16:04 ` Miles Chen
2022-01-22 9:17 ` [PATCH 03/31] clk: mediatek: gate: Internalize clk implementation Chen-Yu Tsai
2022-01-24 16:09 ` Miles Chen
2022-01-22 9:17 ` [PATCH 04/31] clk: mediatek: gate: Implement unregister API Chen-Yu Tsai
2022-01-24 16:21 ` Miles Chen
2022-01-22 9:17 ` [PATCH 05/31] clk: mediatek: gate: Clean up included headers Chen-Yu Tsai
2022-01-24 16:29 ` Miles Chen
2022-01-22 9:17 ` [PATCH 06/31] clk: mediatek: cpumux: Implement unregister API Chen-Yu Tsai
2022-01-25 17:11 ` Miles Chen
2022-01-22 9:17 ` [PATCH 07/31] clk: mediatek: cpumux: Internalize struct mtk_clk_cpumux Chen-Yu Tsai
2022-01-25 17:14 ` Miles Chen
2022-01-22 9:17 ` [PATCH 08/31] clk: mediatek: cpumux: Clean up included headers Chen-Yu Tsai
2022-01-25 17:16 ` Miles Chen
2022-01-22 9:17 ` [PATCH 09/31] clk: mediatek: mux: Implement unregister API Chen-Yu Tsai
2022-01-25 17:20 ` Miles Chen
2022-01-26 6:04 ` [PATCH 13/31] clk: mediatek: pll: " Miles Chen
2022-01-26 6:18 ` Chen-Yu Tsai
2022-01-22 9:17 ` [PATCH 10/31] clk: mediatek: mux: Internalize struct mtk_clk_mux Chen-Yu Tsai
2022-01-25 17:22 ` Miles Chen
2022-01-22 9:17 ` [PATCH 11/31] clk: mediatek: mux: Clean up included headers Chen-Yu Tsai
2022-01-25 17:38 ` Miles Chen
2022-01-26 6:32 ` Chen-Yu Tsai
2022-01-22 9:17 ` [PATCH 12/31] clk: mediatek: pll: Split definitions into separate header file Chen-Yu Tsai
2022-01-26 6:06 ` Miles Chen
2022-01-22 9:17 ` [PATCH 13/31] clk: mediatek: pll: Implement unregister API Chen-Yu Tsai
2022-01-22 9:17 ` [PATCH 14/31] clk: mediatek: pll: Clean up included headers Chen-Yu Tsai
2022-01-26 6:36 ` Miles Chen
2022-02-02 12:58 ` Chen-Yu Tsai
2022-01-22 9:17 ` [PATCH 15/31] clk: mediatek: Implement mtk_clk_unregister_fixed_clks() API Chen-Yu Tsai
2022-01-26 6:55 ` Miles Chen
2022-01-22 9:17 ` [PATCH 16/31] clk: mediatek: Implement mtk_clk_unregister_factors() API Chen-Yu Tsai
2022-01-26 6:56 ` Miles Chen
2022-01-22 9:17 ` [PATCH 17/31] clk: mediatek: Implement mtk_clk_unregister_divider_clks() API Chen-Yu Tsai
2022-01-26 6:58 ` Miles Chen
2022-01-22 9:17 ` [PATCH 18/31] clk: mediatek: Implement mtk_clk_unregister_composites() API Chen-Yu Tsai
2022-01-26 7:06 ` Miles Chen
2022-01-22 9:17 ` [PATCH 19/31] clk: mediatek: Add mtk_clk_simple_remove() Chen-Yu Tsai
2022-01-26 7:13 ` Miles Chen
2022-01-22 9:17 ` [PATCH 20/31] clk: mediatek: mtk: Clean up included headers Chen-Yu Tsai
2022-01-26 7:26 ` Miles Chen
2022-01-22 9:17 ` [PATCH 21/31] clk: mediatek: cpumux: Implement error handling in register API Chen-Yu Tsai
2022-01-26 7:29 ` Miles Chen
2022-01-22 9:17 ` [PATCH 22/31] clk: mediatek: gate: " Chen-Yu Tsai
2022-01-26 7:42 ` Miles Chen
2022-01-22 9:17 ` [PATCH 23/31] clk: mediatek: mux: Reverse check for existing clk to reduce nesting level Chen-Yu Tsai
2022-01-26 8:08 ` Miles Chen
2022-01-22 9:17 ` [PATCH 24/31] clk: mediatek: mux: Implement error handling in register API Chen-Yu Tsai
2022-01-26 8:09 ` Miles Chen
2022-01-22 9:17 ` [PATCH 25/31] clk: mediatek: pll: " Chen-Yu Tsai
2022-01-24 12:05 ` [PATCH] clk: mediatek: pll: fix semicolon.cocci warnings kernel test robot
2022-01-24 12:14 ` [PATCH 25/31] clk: mediatek: pll: Implement error handling in register API kernel test robot
2022-01-26 8:13 ` Miles Chen
2022-01-22 9:17 ` [PATCH 26/31] clk: mediatek: mtk: Implement error handling in register APIs Chen-Yu Tsai
2022-01-26 8:16 ` Miles Chen
2022-01-22 9:17 ` [PATCH 27/31] clk: mediatek: Unregister clks in mtk_clk_simple_probe() error path Chen-Yu Tsai
2022-01-26 8:19 ` Miles Chen
2022-01-22 9:17 ` [PATCH 28/31] clk: mediatek: mt8195: Hook up mtk_clk_simple_remove() Chen-Yu Tsai
2022-01-26 8:23 ` Miles Chen
2022-01-22 9:17 ` [PATCH 29/31] clk: mediatek: mt8195: Implement error handling in probe functions Chen-Yu Tsai
2022-01-26 8:37 ` Miles Chen [this message]
2022-01-22 9:17 ` [PATCH 30/31] clk: mediatek: mt8195: Implement remove functions Chen-Yu Tsai
2022-01-26 8:40 ` Miles Chen
2022-01-22 9:17 ` [PATCH 31/31] clk: mediatek: Warn if clk IDs are duplicated Chen-Yu Tsai
2022-01-26 8:59 ` Miles Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220126083741.18563-1-miles.chen@mediatek.com \
--to=miles.chen@mediatek.com \
--cc=chun-jie.chen@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
--cc=wenst@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).