| Message ID | 20220208124034.414635-20-wenst@chromium.org (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | clk: mediatek: Cleanups and Improvements - Part 1 | expand |
On Tue, 2022-02-08 at 20:40 +0800, Chen-Yu Tsai wrote: > In commit c58cd0e40ffa ("clk: mediatek: Add mtk_clk_simple_probe() to > simplify clock providers"), a generic probe function was added to > simplify clk drivers that only needed to support clk gates. However > due > to the lack of unregister APIs, a corresponding remove function was > not > added. > > Now that the unregister APIs have been implemented, add > aforementioned > remove function to make it complete. > > 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-mtk.c | 15 +++++++++++++++ > drivers/clk/mediatek/clk-mtk.h | 1 + > 2 files changed, 16 insertions(+) > > diff --git a/drivers/clk/mediatek/clk-mtk.c > b/drivers/clk/mediatek/clk-mtk.c > index 869e6ae55c82..f108786caeda 100644 > --- a/drivers/clk/mediatek/clk-mtk.c > +++ b/drivers/clk/mediatek/clk-mtk.c > @@ -374,6 +374,8 @@ int mtk_clk_simple_probe(struct platform_device > *pdev) > if (r) > goto free_data; > > + platform_set_drvdata(pdev, clk_data); > + > return r; > > free_data: > @@ -381,4 +383,17 @@ int mtk_clk_simple_probe(struct platform_device > *pdev) > return r; > } > > +int mtk_clk_simple_remove(struct platform_device *pdev) > +{ > + const struct mtk_clk_desc *mcd = > of_device_get_match_data(&pdev->dev); > + struct clk_onecell_data *clk_data = platform_get_drvdata(pdev); > + struct device_node *node = pdev->dev.of_node; > + > + of_clk_del_provider(node); > + mtk_clk_unregister_gates(mcd->clks, mcd->num_clks, clk_data); > + mtk_free_clk_data(clk_data); > + > + return 0; > +} > + > MODULE_LICENSE("GPL"); > diff --git a/drivers/clk/mediatek/clk-mtk.h > b/drivers/clk/mediatek/clk-mtk.h > index 3c3a934f53cd..4fa658f5d934 100644 > --- a/drivers/clk/mediatek/clk-mtk.h > +++ b/drivers/clk/mediatek/clk-mtk.h > @@ -202,5 +202,6 @@ struct mtk_clk_desc { > }; > > int mtk_clk_simple_probe(struct platform_device *pdev); > +int mtk_clk_simple_remove(struct platform_device *pdev); > > #endif /* __DRV_CLK_MTK_H */
Quoting Chen-Yu Tsai (2022-02-08 04:40:22) > In commit c58cd0e40ffa ("clk: mediatek: Add mtk_clk_simple_probe() to > simplify clock providers"), a generic probe function was added to > simplify clk drivers that only needed to support clk gates. However due > to the lack of unregister APIs, a corresponding remove function was not > added. > > Now that the unregister APIs have been implemented, add aforementioned > remove function to make it complete. > > 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> > --- Applied to clk-next
diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c index 869e6ae55c82..f108786caeda 100644 --- a/drivers/clk/mediatek/clk-mtk.c +++ b/drivers/clk/mediatek/clk-mtk.c @@ -374,6 +374,8 @@ int mtk_clk_simple_probe(struct platform_device *pdev) if (r) goto free_data; + platform_set_drvdata(pdev, clk_data); + return r; free_data: @@ -381,4 +383,17 @@ int mtk_clk_simple_probe(struct platform_device *pdev) return r; } +int mtk_clk_simple_remove(struct platform_device *pdev) +{ + const struct mtk_clk_desc *mcd = of_device_get_match_data(&pdev->dev); + struct clk_onecell_data *clk_data = platform_get_drvdata(pdev); + struct device_node *node = pdev->dev.of_node; + + of_clk_del_provider(node); + mtk_clk_unregister_gates(mcd->clks, mcd->num_clks, clk_data); + mtk_free_clk_data(clk_data); + + return 0; +} + MODULE_LICENSE("GPL"); diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h index 3c3a934f53cd..4fa658f5d934 100644 --- a/drivers/clk/mediatek/clk-mtk.h +++ b/drivers/clk/mediatek/clk-mtk.h @@ -202,5 +202,6 @@ struct mtk_clk_desc { }; int mtk_clk_simple_probe(struct platform_device *pdev); +int mtk_clk_simple_remove(struct platform_device *pdev); #endif /* __DRV_CLK_MTK_H */
In commit c58cd0e40ffa ("clk: mediatek: Add mtk_clk_simple_probe() to simplify clock providers"), a generic probe function was added to simplify clk drivers that only needed to support clk gates. However due to the lack of unregister APIs, a corresponding remove function was not added. Now that the unregister APIs have been implemented, add aforementioned remove function to make it complete. 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> --- drivers/clk/mediatek/clk-mtk.c | 15 +++++++++++++++ drivers/clk/mediatek/clk-mtk.h | 1 + 2 files changed, 16 insertions(+)