On Tue, 2022-02-08 at 20:40 +0800, Chen-Yu Tsai wrote:
> The mux clk type within the MediaTek clk driver library only has a
> register function, and no corresponding unregister function. This
> means there is no way for its users to properly implement cleanup
> and removal.
>
> Add a matching unregister function for the mux type clk.
>
> Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
> Reviewed-by: Miles Chen <miles.chen@mediatek.com>
> Reviewed-by: AngeloGioacchino Del Regno <
> angelogioacchino.delregno@collabora.com>
Reviewed-by: Chun-Jie Chen <chun-jie.chen@mediatek.com>
> ---
> drivers/clk/mediatek/clk-mux.c | 35
> ++++++++++++++++++++++++++++++++++
> drivers/clk/mediatek/clk-mux.h | 3 +++
> 2 files changed, 38 insertions(+)
>
> diff --git a/drivers/clk/mediatek/clk-mux.c
> b/drivers/clk/mediatek/clk-mux.c
> index 89f23e111d91..6f0c22a699c3 100644
> --- a/drivers/clk/mediatek/clk-mux.c
> +++ b/drivers/clk/mediatek/clk-mux.c
> @@ -164,6 +164,21 @@ static struct clk *mtk_clk_register_mux(const
> struct mtk_mux *mux,
> return clk;
> }
>
> +static void mtk_clk_unregister_mux(struct clk *clk)
> +{
> + struct mtk_clk_mux *mux;
> + struct clk_hw *hw;
> +
> + hw = __clk_get_hw(clk);
> + if (!hw)
> + return;
> +
> + mux = to_mtk_clk_mux(hw);
> +
> + clk_unregister(clk);
> + kfree(mux);
> +}
> +
> int mtk_clk_register_muxes(const struct mtk_mux *muxes,
> int num, struct device_node *node,
> spinlock_t *lock,
> @@ -198,4 +213,24 @@ int mtk_clk_register_muxes(const struct mtk_mux
> *muxes,
> }
> EXPORT_SYMBOL_GPL(mtk_clk_register_muxes);
>
> +void mtk_clk_unregister_muxes(const struct mtk_mux *muxes, int num,
> + struct clk_onecell_data *clk_data)
> +{
> + int i;
> +
> + if (!clk_data)
> + return;
> +
> + for (i = num; i > 0; i--) {
> + const struct mtk_mux *mux = &muxes[i - 1];
> +
> + if (IS_ERR_OR_NULL(clk_data->clks[mux->id]))
> + continue;
> +
> + mtk_clk_unregister_mux(clk_data->clks[mux->id]);
> + clk_data->clks[mux->id] = ERR_PTR(-ENOENT);
> + }
> +}
> +EXPORT_SYMBOL_GPL(mtk_clk_unregister_muxes);
> +
> MODULE_LICENSE("GPL");
> diff --git a/drivers/clk/mediatek/clk-mux.h
> b/drivers/clk/mediatek/clk-mux.h
> index 27841d649118..cb2ac4f04c58 100644
> --- a/drivers/clk/mediatek/clk-mux.h
> +++ b/drivers/clk/mediatek/clk-mux.h
> @@ -88,4 +88,7 @@ int mtk_clk_register_muxes(const struct mtk_mux
> *muxes,
> spinlock_t *lock,
> struct clk_onecell_data *clk_data);
>
> +void mtk_clk_unregister_muxes(const struct mtk_mux *muxes, int num,
> + struct clk_onecell_data *clk_data);
> +
> #endif /* __DRV_CLK_MTK_MUX_H */