drm/mediatek: mtk_hdmi: Use devm managed version of drm_bridge_add

Simplify the probe/remove functions by using devm_drm_bridge_add()
as now there is no more need to manually remove the bridge.

Reviewed-by: CK Hu <ck.hu@mediatek.com>
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patchwork.kernel.org/project/linux-mediatek/patch/20250217154836.108895-30-angelogioacchino.delregno@collabora.com/
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 2d24fcadce6ba03e2f3ae1ffae242ceae24f1f32..4035666f8f6a154f213a2a9f710b3e53ff1fbbc2 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1730,14 +1730,15 @@ static int mtk_hdmi_probe(struct platform_device *pdev)
        hdmi->bridge.type = DRM_MODE_CONNECTOR_HDMIA;
        hdmi->bridge.vendor = "MediaTek";
        hdmi->bridge.product = "On-Chip HDMI";
-       drm_bridge_add(&hdmi->bridge);
+
+       ret = devm_drm_bridge_add(dev, &hdmi->bridge);
+       if (ret)
+               return dev_err_probe(dev, ret, "Failed to add bridge\n");
 
        ret = mtk_hdmi_clk_enable_audio(hdmi);
-       if (ret) {
-               drm_bridge_remove(&hdmi->bridge);
+       if (ret)
                return dev_err_probe(dev, ret,
                                     "Failed to enable audio clocks\n");
-       }
 
        return 0;
 }
@@ -1746,7 +1747,6 @@ static void mtk_hdmi_remove(struct platform_device *pdev)
 {
        struct mtk_hdmi *hdmi = platform_get_drvdata(pdev);
 
-       drm_bridge_remove(&hdmi->bridge);
        mtk_hdmi_clk_disable_audio(hdmi);
 }