soc: mediatek: mtk-mmsys: Add .remove() callback

Add a .remove() callback to correctly unregister the multimedia clocks
and DRM drivers.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20230222094253.23678-2-angelogioacchino.delregno@collabora.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
index fd2b37d..6edada2 100644 (file)
--- a/drivers/soc/mediatek/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mtk-mmsys.c
@@ -121,6 +121,8 @@ static const struct mtk_mmsys_driver_data mt8365_mmsys_driver_data = {
 struct mtk_mmsys {
        void __iomem *regs;
        const struct mtk_mmsys_driver_data *data;
+       struct platform_device *clks_pdev;
+       struct platform_device *drm_pdev;
        spinlock_t lock; /* protects mmsys_sw_rst_b reg */
        struct reset_controller_dev rcdev;
        struct cmdq_client_reg cmdq_base;
@@ -386,6 +388,7 @@ static int mtk_mmsys_probe(struct platform_device *pdev)
                                             PLATFORM_DEVID_AUTO, NULL, 0);
        if (IS_ERR(clks))
                return PTR_ERR(clks);
+       mmsys->clks_pdev = clks;
 
        if (mmsys->data->is_vppsys)
                goto out_probe_done;
@@ -396,11 +399,22 @@ static int mtk_mmsys_probe(struct platform_device *pdev)
                platform_device_unregister(clks);
                return PTR_ERR(drm);
        }
+       mmsys->drm_pdev = drm;
 
 out_probe_done:
        return 0;
 }
 
+static int mtk_mmsys_remove(struct platform_device *pdev)
+{
+       struct mtk_mmsys *mmsys = platform_get_drvdata(pdev);
+
+       platform_device_unregister(mmsys->drm_pdev);
+       platform_device_unregister(mmsys->clks_pdev);
+
+       return 0;
+}
+
 static const struct of_device_id of_match_mtk_mmsys[] = {
        {
                .compatible = "mediatek,mt2701-mmsys",
@@ -475,6 +489,7 @@ static struct platform_driver mtk_mmsys_drv = {
                .of_match_table = of_match_mtk_mmsys,
        },
        .probe = mtk_mmsys_probe,
+       .remove = mtk_mmsys_remove,
 };
 
 static int __init mtk_mmsys_init(void)