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...@mediatek.com>
Signed-off-by: AngeloGioacchino Del Regno 
<angelogioacchino.delre...@collabora.com>
---
 drivers/gpu/drm/mediatek/mtk_hdmi.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c 
b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 98e8c186dff4..e391cdacd9ee 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1674,14 +1674,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;
 }
@@ -1690,7 +1691,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);
 }
 
-- 
2.48.1

Reply via email to