From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 1DB463783D1 for ; Fri, 10 Jul 2026 05:06:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783660002; cv=none; b=SebnsRQocNyX6q1Mq2SxpKbvZnCjFmc4tpRLcdCqunjjkV2irDq6L8GzA5v9EDIOAZL2lP6FIEr6Rnsrqh8w9EScKh5Y/oOxfCHTo5BHJubqLOSmCLY9KgI992yFvGBxKBFQDMqZOELlF1UIsQzWkUaJJxMq/lrqlon1jzo3zTc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783660002; c=relaxed/simple; bh=JiDQaJ0zD6/ZCscbVOKmAWdNLeoxv2bO5m1HZEhDQpo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tduxOQXHTIpM8kOvSDB6D/zkmLAD8pPwoVFx/y3feuqyKnIoFpDZhEG9MJcdPYm0r/EDKcdo0HPPn6RAhkd9syOCLQB/FJt8xCniQsrIuXStucohnNhROHArpEcjnW6ZVMoWeiNHlsSwvPK1ZwR/pwg70CCj+hYR65no/ECIQaE= 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=Cmm3Mu8j; arc=none smtp.client-ip=209.85.210.171 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="Cmm3Mu8j" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-8454160043aso450675b3a.3 for ; Thu, 09 Jul 2026 22:06:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783659999; x=1784264799; 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=Cmm3Mu8jQPc7PEtx/EH+JmsoLa/LcQ4+GKEwxWxkhleyA5Sd4NXFTjt/CavZAi34Q4 PC8rH7PSJzQtDiSO4ybppqgpTynSpb54ISpuy7nNnl+hWyQCHh/XKkb0YYqeopMf+hzO 3VBvmxFpyJsrIGkxup6K52psWR9CMxc81alguWOtM1OXDJ7YV5VWAAuK5vvUHuUTQosC CFWA03nZKZCDoxWKAPJ/J164U4iL0MauJz0MCnX4pvMxAGZJKNZkB6vK8TZWrfti2lI+ /hF9L16V0JNO91OTFRA707cWbAXFfSylqa1d3zsEXJ7zoiScoAJugQBXaSt/8rqpJNky mFdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783659999; x=1784264799; 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=V/eXC9QV+y49VfkOthwaa/JALtt4TjJzZkzKeuVuAxCyLIYQSWkvJ6ZcfFvXsDFQcF fTx91IrX4dCs8LEiRZ5Qn4VIrn/jCPvuoCCUv813rXB/31CCDRSrpUMr0HqRRLsjDMJQ KMaKXl4Nbw8bNohFT8JyNE5A0NBGaPOv58DFkSdTucNfetMTyUKe0+recFLr/pqOdzuV Z0ORKjO09NFMHLOYNXqk8TC4Fmak7uiiDUD8hQTrLzgCf1XHkdcOslk8X2FN0+opGn3u zXlyabW153X3MM3kJQpGuzFYnohQid3hkd3EueoqSOHB8zsABSA6oFnuq/oinMfW8XR5 RsTQ== X-Forwarded-Encrypted: i=1; AHgh+Ro0aBOfr0Lf/ZaEpDfTYT9yJ7fGJD7bRirdbogQIZ0cJpQ1c5incN1o2qZ5juDLcPY1Kig9LyvnW9+2jw==@vger.kernel.org X-Gm-Message-State: AOJu0YyRn4SDDjWM+ehTIBLxlwAnNzbfTssRbLHJDgHQcf1evmdJiU4+ FFr2fuSTjSlPOWwscblDG95g+rg4oEX2fxIQXHmMdsu82Y3tTopNn6xp X-Gm-Gg: AfdE7ckyxAxg6MMhBYxF2nU+13BCFnb0P9foPZQ0WMsFDy9rwgdljjklVK/BA6RMh3M fQgul7aFHOUs+HWQWfIHi2AG4+Uh++HCQOOwk4T8cJhRwUE9tJRaY4Z7n6Zzcwy8hQWUvHz0xwX rfHUehBSxOMmY1BnQQB/0MVjRIR97Y56CbkpyZGuqB2l0eF9vjlm9vHkeSOmMVnavbw0+WJpjnH D8zVr9Fp8JPfJ0ftSw/nK07aDN9MqinkxWjvRmOTfHj0WIuhX/JW0u5Dfo+q4YqheNIroFBeWdW u0wHLu52EDBrIpe1TY2mMKFVqFvXIfwoQl2y69DWxlgxtVaGMRg3SFMsOLiYT4dnfBGHRmCcVZx +icE625ekyaJZFff2cyH1qIFUesqT52khX9L127MNWIcPD2zRvoGUoePxOLyJ9ailqHbkv0jXxc zOzfrvDSjucLAl6mjJ9uKPXIeFhv3MYpfJ2Ebv9sJYJDG6dKU= X-Received: by 2002:a05:6a00:802:b0:848:5d9b:6885 with SMTP id d2e1a72fcca58-8485d9b6c13mr5846039b3a.77.1783659999232; Thu, 09 Jul 2026 22:06:39 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84847275fa0sm3400499b3a.22.2026.07.09.22.06.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 22:06:38 -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 v3 11/27] ASoC: codecs: madera: Use guard() for mutex locks Date: Fri, 10 Jul 2026 12:04:55 +0700 Message-ID: <20260710050511.14439-9-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260710050511.14439-1-phucduc.bui@gmail.com> References: <20260709045902.498848-1-phucduc.bui@gmail.com> <20260710050511.14439-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