From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 37EF2C43458 for ; Wed, 8 Jul 2026 14:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Cb8oag5ar6FqpWOnXZjHVza9DSOxnESBFSEvSLigZvU=; b=1Pp6NvxeJa4mvqQujWRVDwUf+4 ucaBUY1zluTIyNkThOIoLDo+Q6GXve3WMzdoPN9Dpk/wd8ISRrHQCp1cvkdmadzVIOPkfoh17TQg8 JqXL4lD/lyo3nYZCpSftTT5hcSX6Q1ZrDXu6NpqQKDV9BvOkZxTaZfijYOt79FMRa/Z3j0Adv1upV dKxaDZ9yVYVVAQ+1j5uYfSkmoQGgXSUyG4GnGqjmKup32lYTCIDuw43+1uETY+qczc+uivXr5N1L2 bALncs3riMvD/CU6Uy2CjivRH6a25PvnByBFW+2+gSHvLrIs5ZYqhr0T0sXzMOnHBr6VUzR5fDeUA +9hJJZxQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1whT8d-0000000HHAB-0Xhn; Wed, 08 Jul 2026 14:20:35 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1whT8a-0000000HH77-3q2r for linux-mediatek@lists.infradead.org; Wed, 08 Jul 2026 14:20:34 +0000 Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-3856d6fbcb3so623301a91.2 for ; Wed, 08 Jul 2026 07:20:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783520432; x=1784125232; darn=lists.infradead.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=Cb8oag5ar6FqpWOnXZjHVza9DSOxnESBFSEvSLigZvU=; b=XmMd7Ra/gGXqZan7lObgwMpCQpIHgzCvKxqsdcCRV0VmYSDnggHNLkGTNWKYrz9bGc B1X8WagWIof5ClDsNTXom6V+B5o/Jyp5yuz5d9zqn4vRF01nWRx2x4LtksOBYAVGgs9M BFqQexwNq7v8A+WTd3iMtuErTcJd0e17EaHenIphoxb4fwBvKTcQLxY1ydbIc7vxWE9d b26ASDpuHrC1fJ9adCUnkkfDLZ3rKzeV0jnX2rQ4gCYaeKkAlwRw93DSJ30kVXe9c/7S Z20vHmOTBv5c5sIijeES4vXuSD3CMZAhFdPal66GNXvQO9dp6xUJ4rtWzt0PiIl6Nhhs UhAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783520432; x=1784125232; 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=Cb8oag5ar6FqpWOnXZjHVza9DSOxnESBFSEvSLigZvU=; b=iuxrse65HKJIZGqvJ3XzXaEuqjglytjlxU6AY3TUv/Rg3QLTGvpBvPajUSjATMjQMi mgBOd5rRwWVOMNhn4drUxPorzU6pNy3peGsrLjFEJgM5CN5qayihc3sbOtDlJrfOq4+K 6NfmFHVYkfWcAX1snEAzTqB8zaqorAHmKgBHtLaCe7Hz6WrazBEsLSPP2VD0bc8YVwQX DrwSmkPOrozpffIlaT6glknMEPUnJeLIAqO+l6cCQGR2HhihSBGm4xMNh0cxKOsuIs4D t3CYfB2zStbz9ciynEv8DTZs5r1HH8PrcYTaDQJXQouZlVc0JrxxjQqLJ0GWGUBKhp9W RbsA== X-Forwarded-Encrypted: i=1; AHgh+RrJr1tynhJnetEYQ601gZduN8DcRUYuUfiIGGf1liuNL6nIyj2eL9leRP2stfAabdNeGlB25/WzcMSbKoZahQ==@lists.infradead.org X-Gm-Message-State: AOJu0YwBSdqE3W4jtgMUd2rsRWk0Yy0q1utHiNx+dssCl92mCjCFZFbC hf8EBjYzV11YKAU4qEKWJ7s2OTPxVzTMyaHT+5ASKn69niLAgE00lVUK X-Gm-Gg: AfdE7cmU0uDYam3vKHwKNdXVO9iQ5gzkjbSvM23Q2zDgFudiJQsh8e14gqlrIjOZ5Yn RWogGvqsXTlMEgTAEyhU1uuotfiDW3oTYiki7Dv3FGA4t4ESQa4IdCNx1cMQSdP2wEvD50t7XOf gExG5cbwgOq89/rcsejlTlTyfkBhxjzxd/82YA7oPNPUVIVKb03k9TF9Re8zqZiycx03MGXm1oL CAq+OfDFz+K/jwvwitTla9l1Uiycqe/ujLc6RqoJbUhFRkMu/ESEse1yZkbb5pFzqoSSh5J0hPL uaGyfcoO1k/cQVNcp0zed20QHPR8Gh3osEswYxSC0DUYrny4i5TFbABAybfu+sPF+t+LvAbnFsE 7E/vhAqc30OxQ+BfXgGoW+dipky8GE4lnohBi0tEn21JEO49y3uBpDMQqnWUlgLPd/pcPYWXsdj C5vNPwIZjQRmdhpJU8mNelq6JymDQ2yKGiLh8cT1JIgJCe3iI= X-Received: by 2002:a17:90b:1d51:b0:387:e0db:bc30 with SMTP id 98e67ed59e1d1-38942691945mr2587146a91.38.1783520431851; Wed, 08 Jul 2026 07:20:31 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 07:20:31 -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 11/27] ASoC: codecs: madera: Use guard() for mutex locks Date: Wed, 8 Jul 2026 21:17:18 +0700 Message-ID: <20260708141734.578926-12-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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260708_072032_964240_E2A497F0 X-CRM114-Status: GOOD ( 19.18 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: bui duc phuc Clean up the code using guard() for mutex locks. Merely code refactoring, and no behavior change. Reviewed-by: Charles Keepax Signed-off-by: bui duc phuc --- Changes in v2: - Add Reviewed-by tags from Charles - Remove the temporary `ret` variable and return directly in madera_adsp_rate_put(). sound/soc/codecs/madera.c | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/sound/soc/codecs/madera.c b/sound/soc/codecs/madera.c index 98d72db599d8..55ea6950ca90 100644 --- a/sound/soc/codecs/madera.c +++ b/sound/soc/codecs/madera.c @@ -6,6 +6,7 @@ // Cirrus Logic International Semiconductor Ltd. // +#include #include #include #include @@ -513,7 +514,7 @@ int madera_domain_clk_ev(struct snd_soc_dapm_widget *w, * We can't rely on the DAPM mutex for locking because we need a lock * that can safely be called in hw_params */ - mutex_lock(&priv->rate_lock); + guard(mutex)(&priv->rate_lock); switch (event) { case SND_SOC_DAPM_PRE_PMU: @@ -532,8 +533,6 @@ int madera_domain_clk_ev(struct snd_soc_dapm_widget *w, madera_debug_dump_domain_groups(priv); - mutex_unlock(&priv->rate_lock); - return 0; } EXPORT_SYMBOL_GPL(madera_domain_clk_ev); @@ -875,9 +874,8 @@ static int madera_adsp_rate_get(struct snd_kcontrol *kcontrol, const int adsp_num = e->shift_l; int item; - mutex_lock(&priv->rate_lock); - cached_rate = priv->adsp_rate_cache[adsp_num]; - mutex_unlock(&priv->rate_lock); + scoped_guard(mutex, &priv->rate_lock) + cached_rate = priv->adsp_rate_cache[adsp_num]; item = snd_soc_enum_val_to_item(e, cached_rate); ucontrol->value.enumerated.item[0] = item; @@ -893,7 +891,6 @@ static int madera_adsp_rate_put(struct snd_kcontrol *kcontrol, struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; const int adsp_num = e->shift_l; const unsigned int item = ucontrol->value.enumerated.item[0]; - int ret = 0; if (item >= e->items) return -EINVAL; @@ -903,22 +900,20 @@ static int madera_adsp_rate_put(struct snd_kcontrol *kcontrol, * maintain consistent behaviour that rate domains cannot be changed * while in use since this is a hardware requirement */ - mutex_lock(&priv->rate_lock); + guard(mutex)(&priv->rate_lock); if (!madera_can_change_grp_rate(priv, priv->adsp[adsp_num].cs_dsp.base)) { dev_warn(priv->madera->dev, "Cannot change '%s' while in use by active audio paths\n", kcontrol->id.name); - ret = -EBUSY; + return -EBUSY; } else if (priv->adsp_rate_cache[adsp_num] != e->values[item]) { /* Volatile register so defer until the codec is powered up */ priv->adsp_rate_cache[adsp_num] = e->values[item]; - ret = 1; + return 1; } - mutex_unlock(&priv->rate_lock); - - return ret; + return 0; } static const struct soc_enum madera_adsp_rate_enum[] = { @@ -1061,15 +1056,13 @@ int madera_rate_put(struct snd_kcontrol *kcontrol, * Prevent the domain powering up while we're checking whether it's * safe to change rate domain */ - mutex_lock(&priv->rate_lock); + guard(mutex)(&priv->rate_lock); val = snd_soc_component_read(component, e->reg); val >>= e->shift_l; val &= e->mask; - if (snd_soc_enum_item_to_val(e, item) == val) { - ret = 0; - goto out; - } + if (snd_soc_enum_item_to_val(e, item) == val) + return 0; if (!madera_can_change_grp_rate(priv, e->reg)) { dev_warn(priv->madera->dev, @@ -1082,8 +1075,6 @@ int madera_rate_put(struct snd_kcontrol *kcontrol, ret = snd_soc_put_enum_double(kcontrol, ucontrol); madera_spin_sysclk(priv); } -out: - mutex_unlock(&priv->rate_lock); return ret; } @@ -3041,12 +3032,11 @@ static int madera_hw_params_rate(struct snd_pcm_substream *substream, if ((cur & MADERA_AIF1_RATE_MASK) == (tar & MADERA_AIF1_RATE_MASK)) return 0; - mutex_lock(&priv->rate_lock); + guard(mutex)(&priv->rate_lock); if (!madera_can_change_grp_rate(priv, base + MADERA_AIF_RATE_CTRL)) { madera_aif_warn(dai, "Cannot change rate while active\n"); - ret = -EBUSY; - goto out; + return -EBUSY; } /* Guard the rate change with SYSCLK cycles */ @@ -3055,9 +3045,6 @@ static int madera_hw_params_rate(struct snd_pcm_substream *substream, MADERA_AIF1_RATE_MASK, tar); madera_spin_sysclk(priv); -out: - mutex_unlock(&priv->rate_lock); - return ret; } -- 2.43.0