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 D3602CD98E4 for ; Wed, 17 Jun 2026 10:38:34 +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=MkZBCMurUYtbXlyM1bHHJ4jat4Djw6dn8DDEDOcRodM=; b=eTD5MnXdWE4WbumLr8Mii+76XR vKYn2jF1nRjY0MvnoSWrnr2i+u5nCEWqNuF4Ee85yhjSYiQUlimO0m8oBwAkwNey34b3KnrED7KpC r/98GFKTrlEhLIkYN3LTOBCfIly74hanKfAnbmmtJco5HcsmU16ETyzYOBykNjxPvk50ddFNobAFS MF+Cg0sLAo7jNjwvVx4WGQDc4VVPzOTGNTPGXF5yJPx0EE0s9FrFwybsKqXaebFPybZb+64GMNhm1 krDUbTuwAh5Odbol9f+YH3/Ii0dJFVIqv0hHOrLVvSuOToITEQizwy1pSZ5DdnWFfSVusv+eq207w Rn9e1E6w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZnfA-0000000H7pi-2vcy; Wed, 17 Jun 2026 10:38:28 +0000 Received: from mail-dy1-x1336.google.com ([2607:f8b0:4864:20::1336]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZnf7-0000000H7ma-3LYI for linux-arm-kernel@lists.infradead.org; Wed, 17 Jun 2026 10:38:26 +0000 Received: by mail-dy1-x1336.google.com with SMTP id 5a478bee46e88-30b6dad2382so6294677eec.0 for ; Wed, 17 Jun 2026 03:38:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692705; x=1782297505; 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; bh=MkZBCMurUYtbXlyM1bHHJ4jat4Djw6dn8DDEDOcRodM=; b=KZFJQZWYfsFjVuMcKQeh1asnRAL1zSvuI6lOMO176qbEQ3gpM6J7bZo6cSAPeoHzk+ rx0j15OlmdYR6/jJuMRDOGxOCa4pZF7xSc4ntwh3P/t/K2i6satgsdSrRyvkaT8mGaf9 3Wx+Tk9/f9UWPytTCUkbcNSbnHFtU4nOWNgpEFsUTZMZTjj/jVontyk/XrUrAx2wu1IP e38sQINp1/zUqQUKjvBEjmPvqGSnc0Zf+QvKYOFOekPA9NO3TJYbSZYPwql3WdtGINN9 7pPO30ae5396XdSdENI2Kyrc80m5iIdHkz0tIAaxRL0kEnkMbXQs+E8ZGE9vAzsDy9Mt fk8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692705; x=1782297505; 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=MkZBCMurUYtbXlyM1bHHJ4jat4Djw6dn8DDEDOcRodM=; b=PJQ/LUJOOaFpFrqMbUfPu59W3WmuD9ULC+KiG6YsGpXoYKNALAK4/c8MV1Ylv2WZe5 mHGToOGrfC+UlrUMivlKyljX3wjg9gvadiTC7DDDJBFD/7yZpYUdp+HiQx0btWrMDkMD qv1ZNz30qWZK2EalQhYhN1RVMbYIJGLESl8Wiz7iTaZ+ivch5XU9WgkuGTjIUI7iwFDS 9dC6nvBsW21nulkJMUaj2gYZhExPEQAnecry3F+y1wEOUhEJnkXNKESG8wu0zb105qhA W9gFRfCMoVbTDuRMVR8J7948awuObq23f22Spet3NTM8fTtNwgiHVX2J6GKKUln6wlCc wOFA== X-Forwarded-Encrypted: i=1; AFNElJ9xkcf7pzfF4h1pkZym6tNiIs14AX6RPxkkT/wUytKrOf+uVRdTZHLHdt2XHVENWuZ0/1I5XoXaKVuJ6D6BOncI@lists.infradead.org X-Gm-Message-State: AOJu0YzECsR9QnB857rB033S8tWrZAcWHy/jgDaX7H8JmB35LtYGkpyq 5o3+lGPL8VrKvLAKjE1Kinzx8ZQ/07AKsp04+2ufxxUvOvCDMyzA97mT X-Gm-Gg: AfdE7cm6WoNpHKoarP1R2jhSisP2uYgcIK/Pw8aOEqH2jUigdqZ5OfAorsLodtWUd5G 9bJV6qDVGSsk1VG3NJhd6iSEdKsVZUbfUFpjRM7MMFO2w/kgLigc8Vo24PrvnBraRQfL7by+Sew rFA7B3gV2e78TDp3wfTedf6InEWz9IS8vwMElgkV9FLGO2Kz/hvxsaN5QG2RPe5VQ1dDy2/GxJy L/Gyjto/C9rVw3Tn2biRhmgg7ZZmxq9xDek1klh6l1PLH9dHWmatStDX20OmoCJXmMNwDsc3j4w HImoNrnb8kMnF+pqkyik/I577IaZKE0KRe1OYjsmdH2a55PcvL+bg4SvSQbKulliJuozjV/5FNx uDrBUvSpnAEONzcbKq2FknPwMTugVB1o8vL5BwTlg0/AG+UIQcRh1NPPhx/3ZetraZB+gUdAjG7 ur/j4wJjZQwngYPzf0joLRWk5g2ouL+AJtdGXV5nHqkaZCzNY= X-Received: by 2002:a05:7300:2153:b0:30b:8860:94c1 with SMTP id 5a478bee46e88-30bcae21d20mr1491165eec.23.1781692705015; Wed, 17 Jun 2026 03:38:25 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d0828sm24616275eec.10.2026.06.17.03.38.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:38:24 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Cheng-Yi Chiang , Tzung-Bi Shih , Guenter Roeck , Benson Leung , David Rhodes , Richard Fitzgerald , povik+lin@cutebit.org, Charles Keepax , Support Opensource , Nick Li , Herve Codina , Srinivas Kandagatla , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Lars-Peter Clausen , nuno.sa@analog.com, Steven Eckhoff , patches@opensource.cirrus.com, chrome-platform@lists.linux.dev, asahi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, bui duc phuc Subject: [PATCH 35/78] ASoC: codecs: madera: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:31:52 +0700 Message-ID: <20260617103235.449609-36-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260617103235.449609-1-phucduc.bui@gmail.com> References: <20260617103235.449609-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-20260617_033825_851558_916386E7 X-CRM114-Status: GOOD ( 14.54 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=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. Signed-off-by: bui duc phuc --- sound/soc/codecs/madera.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/sound/soc/codecs/madera.c b/sound/soc/codecs/madera.c index 98d72db599d8..03bb1ed70b29 100644 --- a/sound/soc/codecs/madera.c +++ b/sound/soc/codecs/madera.c @@ -513,7 +513,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 +532,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 +873,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; @@ -903,7 +900,7 @@ 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, @@ -916,8 +913,6 @@ static int madera_adsp_rate_put(struct snd_kcontrol *kcontrol, ret = 1; } - mutex_unlock(&priv->rate_lock); - return ret; } @@ -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