From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 983FD48095B for ; Tue, 21 Jul 2026 10:27:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784629670; cv=none; b=GNe5rUAbGkGZELwi5BaJw5w22Y2xtoYk3nOLsNKhoQYQGxeErNv+Nig81JSqLhl33yU8mRJnzQgIxuRRJxA2DjaGlmMOx4WoATdLaR4Hx7KudGhJan3xyM0hmgPhaFoo1Ye2+t6qaapDRknP9ppfv3R/4pg/Ue5ptyvLlweJV6U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784629670; c=relaxed/simple; bh=JiDQaJ0zD6/ZCscbVOKmAWdNLeoxv2bO5m1HZEhDQpo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KRJ6fA5+7/Rk/+Kmzd28FcUo+wC/TPegdup4MTk16WUIk72UpL2cg8p4/7YkFbvX/4B9O6EU882bCMsTP2MHoCsWuBe95eWnHwTJ2VhzFs+AjZ6x65ccGxZVox4C6866DNgPErAepgjTbdNQ0L/7GgUk0NfZg0fb6WAdnwxhzJU= 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=aKjYi7+9; arc=none smtp.client-ip=209.85.214.169 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="aKjYi7+9" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2cab973140bso136537465ad.3 for ; Tue, 21 Jul 2026 03:27:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784629668; x=1785234468; 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=Cb8oag5ar6FqpWOnXZjHVza9DSOxnESBFSEvSLigZvU=; b=aKjYi7+91K9UWAn8ffaUBdxp7Aht+6ZlhHQ9ciIm515eH3yeOisqGlK89gB+uVueym +47fNUGRbiMuE44YjtjAft1pkw7BMLW+3GstuktmeH+/zuOcmCJ9+WPx3G/KkuCR32mG vFKzDsfVxeorFbZ5IyzOdls2utzwqWfArZfK59Uj/IWwUjKHlNRvCoLcTFYaGokZgEE5 1yeNMvoj6fcARc5UepHcMImMzWscSL8i8IzjLmy3CL2jXQyCx5F6k10AsliNnHgFjw5L qRIZn9wCuqavTXwwRbfhijMCOAc4NRPFKmBC1+fLhF5Q16rwfPAW/9L+0FdLTntsTGOz BHgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784629668; x=1785234468; 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=IbdMxwMs1O7UXLpoTiMfG+m2Gx404J3/nG2sWJezPdpH2+V1RdQcna5Cgw+te03efM cvrJjt0scEiMu89Crw/5w/Yk0oxGFUq0jehUVcP45tcu87QPA5qEaV8WDvImB7hsX2BC bojqvJ/tSOX4PreAd0Q1n7mUXGiXmvuGi+v5ndRZMGS+uT5sPeaSM7igO4yPMStrbk/Q 1Dr2bPVjOv+sWYFeMspuFadiXgXXpOarxftRKrxHff5gvldzy3IMVx3fudmtA7NX2fIy 7qyEMeS9DNwgrTLpEFacI5pfAtn1F/eRosi6yLZ6wj0y8riPSFOY1eehJXw553L8dv2Q wV3w== X-Forwarded-Encrypted: i=1; AHgh+Rpz1P/FmLy4oBBuToG7DLSNOhRSKt7DiXWIv5cKXBUVLKF1z3i2IF8vZCP+A03cMZXel1KYfW3ooPX2sA==@vger.kernel.org X-Gm-Message-State: AOJu0YyGtJkyiakEKFoB8loW36B32j3uNtZfFHc291RNVJ+fsQnweq7b FWctyl+HXHkjaPrh3JqQkOrf7ahW9oRWUOoOxh38cynOPrMfmf7hg9Zd X-Gm-Gg: AR+sD11u03JvyCVmxu/OoGjtylGPRcHvXH+8V/L+RQsM8W30DiTlt72SUSld/Kr8BKy aSFrPy74OsdWMCgfxrPJ7XS4z/lHWBQz7Ic4fxGTe8bbcp1GPd05e0QYyGbXnkWYizZYE/v4VkH FbF1tKFn2gL3MuGIjY8r7vY/+IGCd6hOrEcJRRR542e9Ja31WR9nE9x9tSK02Sl5mmxPLo964BP zR0NjNg9qaH6evY48dBohhuQCR7flY1HL8M9roNpouqUk+uOqhQwEsbcwnt5lOXXAjZHgIGdzmw XrAkjfyRntLfhXQkld3C9aIUos+40u0016evIBrTFC0CTwmstGevbzoQHhWh9qIK0PgCBMY/nQr EGh8h6yLpHVZcAM0q6uPYVR1Ph+8F8qLTRZSiCmKS07iL1UNE5o/SGl/089lLimHwhZQvuNUXA4 7ol6eApgUnGWljBCR+JbSq+xyC1KQ1dqT1EQTX X-Received: by 2002:a17:902:ea03:b0:2ca:e19c:97b with SMTP id d9443c01a7336-2cf34832689mr196284065ad.5.1784629667940; Tue, 21 Jul 2026 03:27:47 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf3448dac2sm73581365ad.3.2026.07.21.03.27.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 03:27:47 -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 v4 11/29] ASoC: codecs: madera: Use guard() for mutex locks Date: Tue, 21 Jul 2026 17:25:42 +0700 Message-ID: <20260721102600.523199-12-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260721102600.523199-1-phucduc.bui@gmail.com> References: <20260721102600.523199-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-sound@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. 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