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 30587C43458 for ; Tue, 30 Jun 2026 06:36:57 +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=oFPEhR4KdzvrM3sAID4Cucf366Ob4IDS2zrn5wLPtbs=; b=Jw2E+hvTfA0KzQD3PPQ2ANPh/J 0eWb6d6vrHX07oQPQuwYLJK2HP89Bi0XYTsxA5F4J22nw/ZS+x9NegprLoaUE1+wxmdqLuwInrsMX sOfmQgLqoiHtzwckkexis7BL3jxmgusQQisI21xunbAQRDZj1CJejkPvTtxzbjYkAMPeD6A+zKDFU YsvjTk2a9TDvZduVKrNr7ZUcg6HH2F+9+E8U/Q4aSf9Yyxf9+SyILzVycAFGLdQ0wCfPzARS5Sw92 Hrisuy4SndUsvzOOvT7HSxYq2/iwaRofUPJJ54B8K3PFBJJZq3uvqWW3+cyXl4n7GtD5o13knEgWZ h/2xMBDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1weS5Y-0000000FyvP-1HA3; Tue, 30 Jun 2026 06:36:56 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1weS5X-0000000FyuQ-3GGY for linux-mediatek@bombadil.infradead.org; Tue, 30 Jun 2026 06:36:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=oFPEhR4KdzvrM3sAID4Cucf366Ob4IDS2zrn5wLPtbs=; b=j1TqpdG0iR/qVxygf0Sk+RPzYI B2uXJXQ1F0ANSjUKyRtU1G0kEq9T4xs+MYRbm+sH+HjzvgUlpD5CmfPILL3p8reWoDBFMMLbBn6tb vN7UZMU43+r1xWFrSkfFoPVGe45p/UqAFh0PaQPPNJ+3tsXf0t2AM3YKkjwDHhi8EFq2C7xe5EQyc q5ebWPchi/No/yRgu+x18yIpqU9ms3coH+IWuZB0aFu5xOj5cZJFEzhEeE8336l+s1EzMhd3xGGv1 8urhQ2bVERqXjVMX75kM00VAOoFm+hJ112LWtO0Sjyz8LSez0N+zDcEiUD9ZxcwD6hjmc2r7ls+7D Y1QdBnjA==; Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by desiato.infradead.org with esmtps (Exim 4.99.2 #2 (Red Hat Linux)) id 1weS5U-00000001ZH9-1MGW for linux-mediatek@lists.infradead.org; Tue, 30 Jun 2026 06:36:54 +0000 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-847a5528b33so119118b3a.3 for ; Mon, 29 Jun 2026 23:36:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801410; x=1783406210; 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=oFPEhR4KdzvrM3sAID4Cucf366Ob4IDS2zrn5wLPtbs=; b=fGoX25uWuumWmRe711ZpnLW/HlR5feFpDYCMU3DbO0D0u3cwugJgXMMPiB1Yf+dzvs 34uR8Td7Lc+Nbbp4FOCBZOxaTth1B5KfQoQbjWbYPAPalU7PVL3vFs7O8pW36dlTxRt0 t0ZBBuTKb38pkR8OnyT4nqM8ChW2zsbRubl/pgtCUFkXo2d7foM/JlVi4/q+AFmSRG0i SlC9VrpGviu2JKaCpOP/POxhag3tAkviPCUjsasMe0Z6u28avwafPgGUecvV5091YPcA d+kf4dE7w7NO1erpeet6L2loBsfhIZLc/7H6btSnVUovr/vBLc1BaO2vuPWJSfZRnWcH pDKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801410; x=1783406210; 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=oFPEhR4KdzvrM3sAID4Cucf366Ob4IDS2zrn5wLPtbs=; b=bZLcPKqox29EVNpNbC5o/6R2qlnF9W/XX/jOb9NJNJ42SLSee8ERpQyInKeXlHUkja kldq/zRT1ThAJW5fQTAMY2OjhNS2dhYvNaRWCAbFZogoBcNARdkHxOpEvYvERTQsil2n jfpfIFxlvQycjGypWBreaXbppAn3VXUxBWWHn3KYx22bmVnIznW/iFKVQmrfhgj79LY7 4BNW+07l9sPIOkabwoF4dadLdVkWrY3h5bbsnwuGCUudw50GwYFWOCrY8DG9lGPQnSFR EUaTBkOc91T+iojMUUvCKqKo6CCXnbD+4gLCNtf+6vfZf5uZ/8Ztt3AXoxaHirPzJUy7 jLkQ== X-Forwarded-Encrypted: i=1; AHgh+Rpn/EY1+7NH7j4zrzYUbmIwALTqfpwdYLFX4zgO7BV2TdsYq2Rob/0LXAKcJsPb62HTMZofp7VAWtGwZj+ieA==@lists.infradead.org X-Gm-Message-State: AOJu0YwiAKd1Z56+qmbNtRnHi1UABAIrmIP+b8x4UpFExrCmBPhDV5eK 8LHFFTnp2C3RTaOfPSXSOlBYlGxRvb7tTZY+J2piTkGS4HS9dVYe7Pcm X-Gm-Gg: AfdE7cmvurIHNaefsnoQ4Zxkq6+FZGAF3V7bNbh1wkVuAfKm8Igp0D7AvzrzYam0aF7 /f0etHydG0Jknym7VVSQ83nbFMZjAen/efh7/NTK/9E/IkiP9xs4/u08LVB4EATmBpj3WtYtN6a WwwJHayx5IeFmREvus819T29c4r+r7u22Iuo8vFFCUrCQ+3vBe/RpDsNdtKpjWHztzENVJnfPsM Dgz8KGuSuAHosS1yCM2IZfC9GQf6KuoOQrsk7IfzFJNduj4ysY9ATXo6hGMWX0Z7389eOWfcC0O dISdBfOPjoPMPS3BBAaEENjirTefDVuDDLA7BL5x+7q1Qq1eopM6XDsFuh7rvK5EkMEe+Yp0yxo YxC+HbLvaS441NVRWiPPWGJE3XNysIvCQQrLUnHBIWnkPSjvYdvt/6iR6jNiPH4svaqIf/Igdmw O4xY12K4UxS1pIHK7hl59WH17KBHx4AV2ml9J/NRTS7050zxs= X-Received: by 2002:a05:6a00:2c89:b0:845:ba94:a56 with SMTP id d2e1a72fcca58-8479eed0fa5mr1777284b3a.5.1782801410446; Mon, 29 Jun 2026 23:36:50 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a02cd237sm1165061b3a.32.2026.06.29.23.36.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:36:50 -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 11/27] ASoC: codecs: madera: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:33 +0700 Message-ID: <20260630063449.503996-12-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260630063449.503996-1-phucduc.bui@gmail.com> References: <20260630063449.503996-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-20260630_073652_703671_9D5638BE X-CRM114-Status: GOOD ( 14.93 ) 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. Signed-off-by: bui duc phuc --- sound/soc/codecs/madera.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/sound/soc/codecs/madera.c b/sound/soc/codecs/madera.c index 98d72db599d8..7f1db2a7e703 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; @@ -903,7 +901,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 +914,6 @@ static int madera_adsp_rate_put(struct snd_kcontrol *kcontrol, ret = 1; } - mutex_unlock(&priv->rate_lock); - return ret; } @@ -1061,15 +1057,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 +1076,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 +3033,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 +3046,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