From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 A834D48BD5D for ; Wed, 8 Jul 2026 14:20:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520410; cv=none; b=pAiJPcio1OLzM/vvhMH5Og2Ela0KQeMP14z4lJ/y3E72ZDVlKjgXxouF0TZuADHrzrR9hTL1v7IxcnJdPCb/6TQ9npXaic/QMiFfs863aVTABAJ+AX/z3QrhcaAJaX2WsA7ynjZyrXWuQ7vE8vKwVocBOmsjdnzZJ7jcE0EcRQg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520410; c=relaxed/simple; bh=+nT6I4Pca0g3yL9/0MMMJ9eU5lzYcdje8+rHxYbR5Lw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OTrnEFE+YmerABJ8FVhg0j+9CYO+cdmSJ0k7UBrUFn5m5Vpdb2v1Y4SA08I8zHLJBGSqvJQbzrqfmIuwzs31nWvL0ExOh9yJOHDBf3xzZX6UkNYlQASDe97Jud70F1f7+gCapwdskH2emCIfGZLwz6SFjQB8IzdRrYAtAhDXDgE= 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=Dh2SXtFf; arc=none smtp.client-ip=209.85.214.170 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="Dh2SXtFf" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2c7c61b5292so14149625ad.0 for ; Wed, 08 Jul 2026 07:20:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783520408; x=1784125208; 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:content-type; bh=aUrf6Km35HLEs48Iv+5EKVZGrilhk0m+5i7bYMdUoc0=; b=Dh2SXtFfTzz/wBOBCb1kES4k8pWeeScR3nlVFi9pqJ4rp2Dycnnr+YgcklzW/qjI3U NZ91ELzl6XDDhV/8y2yj6Q6VkVeLe0X3Lt+rKLlH0lmv3nbZ9jED4euIGdRrPtUc/oQ9 L9d+HOXV+n2tzSXeDUQ2UqSOBhpzpLfqS1Nm4XHk3pO1MP6mx36NgMWn4ssmKwmCNeoy SJ2Z6UI0/wNEURrhtF7wSyh3d+QS1+RuLcLohADskcr2bUcFEEfmuYwNQFtBsfFPkfee rmBBl92sFLfZJArj2ZG7ySVZVU4+q8p8sXc2k+YzRP8PsL2CmV2IrnKUVAD5vrk5im0e 7WSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783520408; x=1784125208; 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:content-type; bh=aUrf6Km35HLEs48Iv+5EKVZGrilhk0m+5i7bYMdUoc0=; b=KNN044sdYkBhBvngWhPzL/589gTNRKlGcT+W6xEBGBRaioSr/6/KyM7wf+I5S0phD5 6KJlujN0IpFOwRya+7Cdqcu+BzVXEMqpaU0+oSx601n7466v+o31ly7n+QCffXFdXt73 HUA14V46co1frGP45y/GC91yiaoYD7q6Sz+27ku1Ld3abInFQMEF+y9WebxYHe/sEEJF NtZu3P2P8GVVBc9y/nvqdxKPymhjIuHXDg2nR9c6WArKccseT/9iae9s0xtQLenZtqbU 84Ky0o0YObZzYISZAg+dKwowMNxiATvsf9Xyk4GNFA3mMLZhMr+WcE+jABPsbiIwMcuI Jq6A== X-Forwarded-Encrypted: i=1; AHgh+RonmUoSGuKwOuBpFSlTBHoIRBhRoP/Clv8xV3ENRPon0gcLwswtpmbqMGsVanymyeNXP7cUvZK+d2JRgFk=@vger.kernel.org X-Gm-Message-State: AOJu0YzDnWbu0it6X7MrOsh+LXQh7hl3kpUcEkv74wFW6YvwkkfGKcT5 ejSYTmT6P+O2oWvwoxDe1XhqdZUzofILZXcMvGbLpqttQNTQyIvT+QzP X-Gm-Gg: AfdE7clwchFyPkLFZw7DE88X1zCuxK9qTaRu43RnRtJ5MUKvSM+fb0lUW8Yi8kWmj6n H8Z+6gbZiVp70Viiya1mzRJd7RonqEUCsc9DTSdw/EWgD59vtkPo7q+jFj7tNAITfIumSvJMFE2 3bf7HlAWx0POo0zW2oLy2zxKEs1SKDrA1cFLKsTOlLPpt3LAdZrwNRDQskQPM3Upd4ezyiByoET ULK2s5KGa9VW69YfLi86gxUwSSlaZ77c9e4LX+JYxkVRqFS7FhBJCmNZF7aa/EHh781MKIBaqYa R9shMTscwGVUd3aIZ4w/O13FJcvhtr0HfEORborjXVuaKQtS6GBU7CZm84pY7tP1xh+kz5c8wGk iSz10t1YVOhWg508U+/Fo1z9vHgZrF7mgg0+A1A++eNzkvKZPwJWOuJ4620T+4jdMkXsHCGTGRr 1PX1nTecrm7CxR6wtDw+edxr5y9kRkQdxSe+zyCJjyjtqf8uZlLsmTIJBZng== X-Received: by 2002:a17:902:ce82:b0:2c9:97a9:2097 with SMTP id d9443c01a7336-2ccea3a28e7mr30636245ad.43.1783520408022; Wed, 08 Jul 2026 07:20:08 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d3bcc0sm28841575ad.67.2026.07.08.07.20.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 07:20:07 -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 v2 08/27] ASoC: codecs: hdmi-codec: Use guard() for mutex locks Date: Wed, 8 Jul 2026 21:17:15 +0700 Message-ID: <20260708141734.578926-9-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260708141734.578926-1-phucduc.bui@gmail.com> References: <20260708141734.578926-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