From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 364BA25783A for ; Tue, 30 Jun 2026 06:36:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801389; cv=none; b=fIdf0u9Zgpg1ejAlXNyIn0ilUHTnjF6le6NqVz2TU01pm+ZvwR9qgaMvJM3e4lW/6yyhYDCJS+xbF/6YRLx+t2V0WsGlksK9WakDxKskF4UEE2/eaqVK94iz0cCUUvIsMLws1GBQZuySYRTErhn4AiGiVMnuHIXJvHHkVfj4JKQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801389; c=relaxed/simple; bh=+nT6I4Pca0g3yL9/0MMMJ9eU5lzYcdje8+rHxYbR5Lw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=adHwINHCEGfI2gOTNJQZMxJDE82i6l9Cdb2kFXASAl0pYU9giVv+Yh3SVXZJdVx9bWGOPnkTfpCAcIaQ6H0jC7GXXNBNwKWP1lbAopS8OAzVkEbtaJnqF+A0zMSOUL2SSNG0uImKP4gP9iQItuOYGrfoYnHIb/FCTTqEALVQIbY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=P5mGfMgn; arc=none smtp.client-ip=209.85.210.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P5mGfMgn" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-8478a25f268so1050585b3a.2 for ; Mon, 29 Jun 2026 23:36:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801387; x=1783406187; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aUrf6Km35HLEs48Iv+5EKVZGrilhk0m+5i7bYMdUoc0=; b=P5mGfMgnYwYeSc3VEEWtIjtm29Zz/4VHRHeQJNDbW1Tbnzk0Jhi6QT4LgJJMngXM73 levt4j+s2TYA/fxjKkZ0IFZexKccO7ZDh1Wty6VaTEXook9iLnOx9DmTbGUKbd1QtzWr VNQb6aq9reelOkXVna06oKTUcLfLAPcO1kruwFkpp4cfmy9oSu5lfGQ90gZaGNmE6CRP 2+pA2V5h/EcplylHqhT/HgZXimwWxBDq/zefszG8yq/uDfF/34qTH6iNOelXuN7W7PAU Fy45EhtsTJYLPakwpCQws1xMQLa9JPrsMzXaoQk6mw1QDWb+Jw8AxWnfRoD2btNaCzIr u9Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801387; x=1783406187; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=aUrf6Km35HLEs48Iv+5EKVZGrilhk0m+5i7bYMdUoc0=; b=aY5lbE7IGonfrM7Wuq/imhc7iTNbwHrvOFVCgFgdmmYXq1bdWLfGCU79CiscERPQwl nBS9tR8XSVdCjIn/RQ+H8L39yqsPEOJ1oLbDbSGkpowuNBz+KFXXOF3TD3TvE9wJY+jZ kNyiwyRyCh50JopeCga36X8h+EeWb8NzCFMdL7wLq5apXnE82Dr33ZWXbEXzsEWaDtpk BqrgyEFkMs8gZ0SuVQb8tgl76qEX+aJVYn5HLqqG7e/QkehC/cxmjAonRIDVN0Y5F+75 yI1yMORYmjN8KPtwR3jAQ3erdi2H8N2U8ihDU3ek1kfnXlxvLeVhMA7VjCK5W79H7fdS 0ANw== X-Forwarded-Encrypted: i=1; AHgh+RqCd/kcek8sYW0v+DaipVR4kpMv2GINJJTeNIsmcS2Zzh/vkSXcG46MUdR7AwueEyxYpp5Au0XMNcMAJPg=@vger.kernel.org X-Gm-Message-State: AOJu0YynR0AhPC5FNzdvAq/hjrJ8BgO0PDd29CQ20S6xYbQfBx3Li+f0 YIQlfhalOBJstXW1DziRS0HZDcK2B8JZT/1+bH4mw5ezrAdldLxPblFT X-Gm-Gg: AfdE7cmIxyoGTZXDocO56O4VoDs305NJkkpFumEQrVLMJVns6tV0Qf61efLzsq3qI0L IccIcQ32bcuQgixLSM9+PEf7/OyM2VvlKRgnv5kmFYVHqLGQGum5/aWoc8CKb5nUJ+xLT9Jx4WG QBTDfeQT97600qbU0eupci/LLZhSx43o/pA7YI6u764OlWngGv0bSk+sI62GK3hZWbaCB4jpD11 of5BzlOHnNMmQk0KHQNEG2AMrtZOzFBb7XYiEcP+dJFg4460Uzb22Nf1sn2JduRdPGlGV6GmKuc Y3KvCIYeBmQLGeZh6XFw4q+kXO6F/fVOLP/coWxQVB4gtvKm7kNlkwQmAlM+TgN7mShczIHnRea iNBp/8Ocl9cGzEDAOIB2maX7dx6mg7Py0WYjXsRpL9+GnwzXhpcdvA7BEZs6VIg6xg0PuEXm+SB qGTd09VbDa8jSB+QOH4Rqx6o95gvBrsCFVOt1fvWdQax8G3co= X-Received: by 2002:a05:6a00:995:b0:846:169c:d815 with SMTP id d2e1a72fcca58-8479f2d139dmr2002482b3a.60.1782801387427; Mon, 29 Jun 2026 23:36:27 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a02cd237sm1165061b3a.32.2026.06.29.23.36.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:36:27 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Takashi Iwai , Nick Li , Herve Codina Cc: Support Opensource , Liam Girdwood , Jaroslav Kysela , Srinivas Kandagatla , Charles Keepax , Richard Fitzgerald , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Linus Walleij , Kuninori Morimoto , u.kleine-koenig@baylibre.com, Zhang Yi , Marco Crivellari , Kees Cook , HyeongJun An , Arnd Bergmann , Qianfeng Rong , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bui duc phuc Subject: [PATCH 08/27] ASoC: codecs: hdmi-codec: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:30 +0700 Message-ID: <20260630063449.503996-9-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260630063449.503996-1-phucduc.bui@gmail.com> References: <20260630063449.503996-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: bui duc phuc Clean up the code using guard() for mutex locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/codecs/hdmi-codec.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 13ae9e83bc21..bc2c22436ba6 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -4,6 +4,7 @@ * Copyright (C) 2015 Texas Instruments Incorporated - https://www.ti.com/ * Author: Jyri Sarha */ +#include #include #include #include @@ -452,31 +453,30 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream, if (!((has_playback && tx) || (has_capture && !tx))) return 0; - mutex_lock(&hcp->lock); + guard(mutex)(&hcp->lock); if (hcp->busy) { dev_err(dai->dev, "Only one simultaneous stream supported!\n"); - mutex_unlock(&hcp->lock); return -EINVAL; } if (hcp->hcd.ops->audio_startup) { ret = hcp->hcd.ops->audio_startup(dai->dev->parent, hcp->hcd.data); if (ret) - goto err; + return ret; } if (tx && hcp->hcd.ops->get_eld) { ret = hcp->hcd.ops->get_eld(dai->dev->parent, hcp->hcd.data, hcp->eld, sizeof(hcp->eld)); if (ret) - goto err; + return ret; snd_parse_eld(dai->dev, &hcp->eld_parsed, hcp->eld, sizeof(hcp->eld)); ret = snd_pcm_hw_constraint_eld(substream->runtime, hcp->eld); if (ret) - goto err; + return ret; /* Select chmap supported */ hdmi_codec_eld_chmap(hcp); @@ -484,8 +484,6 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream, hcp->busy = true; -err: - mutex_unlock(&hcp->lock); return ret; } @@ -503,9 +501,8 @@ static void hdmi_codec_shutdown(struct snd_pcm_substream *substream, hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; hcp->hcd.ops->audio_shutdown(dai->dev->parent, hcp->hcd.data); - mutex_lock(&hcp->lock); + guard(mutex)(&hcp->lock); hcp->busy = false; - mutex_unlock(&hcp->lock); } static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai, -- 2.43.0