From: AngeloGioacchino Del Regno Date: Mon, 17 Feb 2025 15:48:22 +0000 (+0100) Subject: drm/mediatek: mtk_hdmi: Use devm managed version of drm_bridge_add X-Git-Tag: v6.15-rc1~120^2~5^2~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb8779b2641374c140c7e55f251900d71837759f;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: AngeloGioacchino Del Regno Link: https://patchwork.kernel.org/project/linux-mediatek/patch/20250217154836.108895-30-angelogioacchino.delregno@collabora.com/ Signed-off-by: Chun-Kuang Hu --- diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c index 2d24fcadce6ba..4035666f8f6a1 100644 --- 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); }