From nobody Thu Dec 18 10:02:23 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9AD3B256C92; Tue, 11 Feb 2025 11:35:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739273708; cv=none; b=sNFZzgUrFA35ZpbmpxQ1IzXFuRh9i/GsUOmNNz1K2D0FQ8CWjA+p0s/39p55Rz9hQgf7/WgsnRKyvC5Aws68ABrz4NFghvz5JLvTqfiOEzZRZl6NmT3LPUR3226EHe0j8MM/5rYSNjkfoFixvDzVf88LYP29gPMDWaxulxKpm1w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739273708; c=relaxed/simple; bh=a3hLnJudcxQA/+esIRp1SpuZ0KWSZ19ubGovf8MoZ3E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y1+g5uN12wemrVfFaN3G4aIjA9IfYN4+WEW/kacrAHTCh4NlpO/x3wcFGmepkrEWa/FZKXdIf9w6k+zr8tnmKVHIT8xZGSoHYiC/He1TO/kEK3vX2hvWYiMo67Ci6JsYTvs3j2+akP0PFSnefur0e3S0fInl76TS8yGyXLMIIAk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=cj2NzvKI; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="cj2NzvKI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739273705; bh=a3hLnJudcxQA/+esIRp1SpuZ0KWSZ19ubGovf8MoZ3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cj2NzvKIJ28NDK7kZF2Kk7OSBiyOka0cz7/Ul4qHmJRN67cehI57jPRaOgyk3n42c 4KQ8cC1DeaE3K9pIYuQsQAiRBZ6pKQn1KMJrrAwRFQ8Mrz/FF6uPmDFswJz7jOCD/d TtwUpqfCiFjiplo6gVoy2nCpdScoWWV9nU3uDaopEKnbINTPNGjXuzNBMFcci8zClt JMy40HlPLxJFC34aq0rTtQ65iO8ESkHmgadu4X+HZmUsxHWlKT1eadIdQd2eDNPNes U/3JjTp8E8FRd23lJGfKNKkgksWeFoZUBpemgszoIGZfMUa5modtiiJauhoxlOM1Ch ojFOzjmber9NQ== Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by bali.collaboradmins.com (Postfix) with ESMTPSA id A5F0617E1562; Tue, 11 Feb 2025 12:35:03 +0100 (CET) From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: p.zabel@pengutronix.de, airlied@gmail.com, simona@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, ck.hu@mediatek.com, jitao.shi@mediatek.com, jie.qiu@mediatek.com, junzhi.zhao@mediatek.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, dmitry.baryshkov@linaro.org, lewis.liao@mediatek.com, ives.chenjh@mediatek.com, tommyyl.chen@mediatek.com, jason-jh.lin@mediatek.com Subject: [PATCH v6 30/42] drm/mediatek: mtk_hdmi: Remove goto in mtk_hdmi_clk_enable_audio() Date: Tue, 11 Feb 2025 12:33:57 +0100 Message-ID: <20250211113409.1517534-31-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250211113409.1517534-1-angelogioacchino.delregno@collabora.com> References: <20250211113409.1517534-1-angelogioacchino.delregno@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: AngeloGioacchino Del Regno --- drivers/gpu/drm/mediatek/mtk_hdmi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek= /mtk_hdmi.c index ae5023298ff4..9c929092a9a9 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -1095,13 +1095,12 @@ static int mtk_hdmi_clk_enable_audio(struct mtk_hdm= i *hdmi) return ret; =20 ret =3D 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; + } =20 return 0; -err: - clk_disable_unprepare(hdmi->clk[MTK_HDMI_CLK_AUD_BCLK]); - return ret; } =20 static void mtk_hdmi_clk_disable_audio(struct mtk_hdmi *hdmi) --=20 2.48.1