Messages in this thread | | | From | Miles Chen <> | Subject | Re: [PATCH 18/31] clk: mediatek: Implement mtk_clk_unregister_composites() API | Date | Wed, 26 Jan 2022 15:06:09 +0800 |
| |
> 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> > --- > drivers/clk/mediatek/clk-mtk.c | 41 ++++++++++++++++++++++++++++++++++ > drivers/clk/mediatek/clk-mtk.h | 2 ++ > 2 files changed, 43 insertions(+) > > diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c > index 3a6dfe445e63..2150ed8678e0 100644 > --- a/drivers/clk/mediatek/clk-mtk.c > +++ b/drivers/clk/mediatek/clk-mtk.c > @@ -233,6 +233,27 @@ 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 = __clk_get_hw(clk); > + struct clk_composite *composite = to_clk_composite(hw); > + struct clk_mux *mux = NULL; > + struct clk_gate *gate = NULL; > + struct clk_divider *div = NULL;
Like mtk_clk_unregister_pll(clk), let's check !hw for consistency of clk unregister functions.
thanks, Miles > + > + 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 +280,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; > -- > 2.35.0.rc0.227.g00780c9af4-goog
| |