Skip to content

Commit b87385e

Browse files
wensbebarino
authored andcommitted
clk: mediatek: Implement mtk_clk_unregister_divider_clks() API
mtk_clk_register_divider_clks(), as the name suggests, is used to register a given list of divider 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: Miles Chen <miles.chen@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20220208124034.414635-18-wenst@chromium.org Reviewed-by: Chun-Jie Chen <chun-jie.chen@mediatek.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 1c6d6b6 commit b87385e

2 files changed

Lines changed: 24 additions & 3 deletions

File tree

drivers/clk/mediatek/clk-mtk.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,25 @@ void mtk_clk_register_dividers(const struct mtk_clk_divider *mcds,
286286
}
287287
}
288288

289+
void mtk_clk_unregister_dividers(const struct mtk_clk_divider *mcds, int num,
290+
struct clk_onecell_data *clk_data)
291+
{
292+
int i;
293+
294+
if (!clk_data)
295+
return;
296+
297+
for (i = num; i > 0; i--) {
298+
const struct mtk_clk_divider *mcd = &mcds[i - 1];
299+
300+
if (IS_ERR_OR_NULL(clk_data->clks[mcd->id]))
301+
continue;
302+
303+
clk_unregister_divider(clk_data->clks[mcd->id]);
304+
clk_data->clks[mcd->id] = ERR_PTR(-ENOENT);
305+
}
306+
}
307+
289308
int mtk_clk_simple_probe(struct platform_device *pdev)
290309
{
291310
const struct mtk_clk_desc *mcd;

drivers/clk/mediatek/clk-mtk.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,11 @@ struct mtk_clk_divider {
176176
.div_width = _width, \
177177
}
178178

179-
void mtk_clk_register_dividers(const struct mtk_clk_divider *mcds,
180-
int num, void __iomem *base, spinlock_t *lock,
181-
struct clk_onecell_data *clk_data);
179+
void mtk_clk_register_dividers(const struct mtk_clk_divider *mcds, int num,
180+
void __iomem *base, spinlock_t *lock,
181+
struct clk_onecell_data *clk_data);
182+
void mtk_clk_unregister_dividers(const struct mtk_clk_divider *mcds, int num,
183+
struct clk_onecell_data *clk_data);
182184

183185
struct clk_onecell_data *mtk_alloc_clk_data(unsigned int clk_num);
184186
void mtk_free_clk_data(struct clk_onecell_data *clk_data);

0 commit comments

Comments
 (0)