]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/mediatek: mtk_hdmi: Remove goto in mtk_hdmi_clk_enable_audio()
authorAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Mon, 17 Feb 2025 15:48:24 +0000 (16:48 +0100)
committerChun-Kuang Hu <chunkuang.hu@kernel.org>
Thu, 20 Feb 2025 14:18:23 +0000 (14:18 +0000)
If the clk_prepare_enable() call for the SPDIF clock fails, just
disable and unprepare the clock in the error check branch and
return immediately instead of jumping to the end with a goto,
slightly reducing code size.

This commit brings no functional changes.

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-32-angelogioacchino.delregno@collabora.com/
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
drivers/gpu/drm/mediatek/mtk_hdmi.c

index 2ff025e9151bd5ae38202c152e96fd1bd653ec2a..aa4009156ae58bc141a44f539215df8ba73625ab 100644 (file)
@@ -1159,13 +1159,12 @@ static int mtk_hdmi_clk_enable_audio(struct mtk_hdmi *hdmi)
                return ret;
 
        ret = clk_prepare_enable(hdmi->clk[MTK_HDMI_CLK_AUD_SPDIF]);
-       if (ret)
-               goto err;
+       if (ret) {
+               clk_disable_unprepare(hdmi->clk[MTK_HDMI_CLK_AUD_BCLK]);
+               return ret;
+       }
 
        return 0;
-err:
-       clk_disable_unprepare(hdmi->clk[MTK_HDMI_CLK_AUD_BCLK]);
-       return ret;
 }
 
 static void mtk_hdmi_clk_disable_audio(struct mtk_hdmi *hdmi)