Re: [PATCH v3 18/31] clk: mediatek: Implement mtk_clk_unregister_composites() API

Chun-Jie Chen
2022-02-15T06:40:09Z

On Tue, 2022-02-08 at 20:40 +0800, Chen-Yu Tsai wrote:
> mtk_clk_register_composites(), as the name suggests, is used to
> register
> a given list of composite clks. However it is lacking a counterpart
> unregister API.
>
> Implement said unregister API so that the various clock platform
> drivers
> can utilize it to do proper unregistration, cleanup and removal.
>
> In the header file, the register function's declaration is also
> reformatted to fit code style guidelines.
>
> Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
> Reviewed-by: AngeloGioacchino Del Regno <
> angelogioacchino.delregno@collabora.com>
> Reviewed-by: Miles Chen <miles.chen@mediatek.com>

Reviewed-by: Chun-Jie Chen <chun-jie.chen@mediatek.com>
> ---
> drivers/clk/mediatek/clk-mtk.c | 46
> ++++++++++++++++++++++++++++++++++
> drivers/clk/mediatek/clk-mtk.h | 2 ++
> 2 files changed, 48 insertions(+)
>
> diff --git a/drivers/clk/mediatek/clk-mtk.c
> b/drivers/clk/mediatek/clk-mtk.c
> index 3a6dfe445e63..869e6ae55c82 100644
> --- a/drivers/clk/mediatek/clk-mtk.c
> +++ b/drivers/clk/mediatek/clk-mtk.c
> @@ -233,6 +233,32 @@ struct clk *mtk_clk_register_composite(const
> struct mtk_composite *mc,
> return ERR_PTR(ret);
> }
>
> +static void mtk_clk_unregister_composite(struct clk *clk)
> +{
> + struct clk_hw *hw;
> + struct clk_composite *composite;
> + struct clk_mux *mux = NULL;
> + struct clk_gate *gate = NULL;
> + struct clk_divider *div = NULL;
> +
> + hw = __clk_get_hw(clk);
> + if (!hw)
> + return;
> +
> + composite = to_clk_composite(hw);
> + if (composite->mux_hw)
> + mux = to_clk_mux(composite->mux_hw);
> + if (composite->gate_hw)
> + gate = to_clk_gate(composite->gate_hw);
> + if (composite->rate_hw)
> + div = to_clk_divider(composite->rate_hw);
> +
> + clk_unregister_composite(clk);
> + kfree(div);
> + kfree(gate);
> + kfree(mux);
> +}
> +
> void mtk_clk_register_composites(const struct mtk_composite *mcs,
> int num, void __iomem *base, spinlock_t *lock,
> struct clk_onecell_data *clk_data)
> @@ -259,6 +285,26 @@ void mtk_clk_register_composites(const struct
> mtk_composite *mcs,
> }
> EXPORT_SYMBOL_GPL(mtk_clk_register_composites);
>
> +void mtk_clk_unregister_composites(const struct mtk_composite *mcs,
> int num,
> + struct clk_onecell_data *clk_data)
> +{
> + int i;
> +
> + if (!clk_data)
> + return;
> +
> + for (i = num; i > 0; i--) {
> + const struct mtk_composite *mc = &mcs[i - 1];
> +
> + if (IS_ERR_OR_NULL(clk_data->clks[mc->id]))
> + continue;
> +
> + mtk_clk_unregister_composite(clk_data->clks[mc->id]);
> + clk_data->clks[mc->id] = ERR_PTR(-ENOENT);
> + }
> +}
> +EXPORT_SYMBOL_GPL(mtk_clk_unregister_composites);
> +
> void mtk_clk_register_dividers(const struct mtk_clk_divider *mcds,
> int num, void __iomem *base, spinlock_t *lock,
> struct clk_onecell_data *clk_data)
> diff --git a/drivers/clk/mediatek/clk-mtk.h
> b/drivers/clk/mediatek/clk-mtk.h
> index e3ae22fb0334..3c3a934f53cd 100644
> --- a/drivers/clk/mediatek/clk-mtk.h
> +++ b/drivers/clk/mediatek/clk-mtk.h
> @@ -153,6 +153,8 @@ struct clk *mtk_clk_register_composite(const
> struct mtk_composite *mc,
> void mtk_clk_register_composites(const struct mtk_composite *mcs,
> int num, void __iomem *base, spinlock_t *lock,
> struct clk_onecell_data *clk_data);
> +void mtk_clk_unregister_composites(const struct mtk_composite *mcs,
> int num,
> + struct clk_onecell_data *clk_data);
>
> struct mtk_clk_divider {
> int id;