From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 B26DE426ECA for ; Wed, 8 Jul 2026 12:51:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783515065; cv=none; b=S2d43swGD1zC/u1S1Sb6KreE9rhL2fNYDnCvPaDbkijKVB1q/1qQ+oaKZBlmDOlfk3V7RlOXcJ/ngdPdc9Q/E1iUADzH/goDFAAFc2oSe0n5SmCwpiRPYi3WquY1cuj0BS13ighOLBg8p5eMOT5aEs6VIJIVyZ3grlSL0HGkJtA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783515065; c=relaxed/simple; bh=6FLcpNOV0G/lngFmbaJv0KBbbNvewbSjUbmrmr4SBjY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K/oro6hPTWwgs3wzZQfSPTt/U+pixsJpS/HeqzYx0s8a05qtvjB5FYC51Z7kGl5MWNM5HKmEs7ZNSMxOaBBe1YN37dm2fKCAblZeNV5GfWUnJ5xrBVNT1/ZGDFxEYVizXSdQOz/shPAKIMbYqy+ETNWDzt7W5PieaIhvTauGRGQ= 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=HGBwbNvY; arc=none smtp.client-ip=209.85.216.48 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="HGBwbNvY" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-381216921aaso646677a91.1 for ; Wed, 08 Jul 2026 05:51:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783515063; x=1784119863; darn=lists.linux.dev; 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=QBAOGNDCN1PJ4euWIObvfkCj8NKOo6+NOGkAVEcmjRI=; b=HGBwbNvY1+nVXCVJ6l3R/rIf9ZgA2+xCX76PhvJxRKebghuTEyXcAvsFjHjdqBeKiE uhzDjlV7I390Lq80kv86ejLBUR+vwx3p1wLUE3d1ejcfFh1kuy7pEq69eJTsFA0rtXgL j7noJcDzRdiYWJz81GlyfBGUyAlK4zjhN4lPa0A5O5mlGKvCn/5dfV6HCNaLUbmGRM5F Cww2Jmrfkb4FuskhWrkPsH6FiNpTt79fjCYIClglsi3c2hXO18euMXDP6ZfhipFRnRSU KZo337/KOHpwEDgqxGyKg+ojipckxGKT1HI15a0sMcpOGZko8L3MxLlCbOUA+Bxc++TY sXhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783515063; x=1784119863; 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=QBAOGNDCN1PJ4euWIObvfkCj8NKOo6+NOGkAVEcmjRI=; b=OtZTh8v1VZ5OgRXWsMiE4lcSlHUnZl03z8IKktBqsiKntlydZOZh7Y0Ag6sVwdiGHv 6K7uaiv71jOt+6370sAvIZbnTZCD3njlju/Hip5qzbd3PT8l+WTh6tnOl7RjivQzDqPW S9/CfcBPobeP05d2wO8nyv0ziSVSKLh2WePFzM6ZxsXJkDxJDVfv5bU4K8J7BaloVn1k 6m8c2pt4s72Q0pzJvUQE2rSieHRbPqd4iKLJkWeCTekhQa1vhXQDp2tj9SR/39cCp84J H34IacTGXqU2rxHjnRldoREavnk7HwrxVafA/4lGTPCZelEoaj8FUq+s7KJEO8/I63xu KC8g== X-Forwarded-Encrypted: i=1; AHgh+RqR7mMGOJVoPpCTzgSV8lSHyRBriitYg2O0itLDKBfKSmtX7U+c15RU3iNRoSYOZ1ytV/F7OA==@lists.linux.dev X-Gm-Message-State: AOJu0YwijD7IBJ4s8eBFy1Cz6GfvT3ahj/Ii3emf89Hl3Xe6QVQG4BAi JtGKaDQkbsaogo01IRfqBNU0oC5202ib8aRugJFYwwHS6dHZEhZhiXiY X-Gm-Gg: AfdE7cl178oi3QpAwi2Ff0tLOLnBYoUVLl9tuylQXjvSAKIpL13scifN3BNmR1pBzK0 x3UgrYIGu6fh7i/hoVT+Wd6XUA4q3IkQ5y78mbIqzYigXKMBtVnQ2RD++1dsU60Ub+IBlsNYaYQ 8MCcBioQKpfrELoRuo0eWjGekRxRRJNNg509V30unCl5UMM8lw7Bx98OfwhzSiV2SUSxQ6Dqcpk owNfiCqSG2B/L7YQPapmSEMTjYCHIcEN9LLXwcxG7OtHAks9gyskyTiJSfoXneBcqVb8u+4s/ru 5X31qs6gHWyDSCZqrUsttK487SBK1wNUCfITFaqiKmAWZRHy1MxCqFUswCmnlnPcj5l4wbMWqnL dCkJxmkiPedQWuejZp9KAKJCdm8CBvqQDe8G0kFHDkbDKpq6vL+XoI65CB81ekO60WOGdz3Hdz/ hfcDnquLwjBVu5/l0H/Ya5lqGT/yCJwbE5tqEtZamUjL7dVGw= X-Received: by 2002:a17:90b:5845:b0:388:cf45:d72c with SMTP id 98e67ed59e1d1-3893ff6309emr2450019a91.15.1783515062917; Wed, 08 Jul 2026 05:51:02 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-387d20a2f2fsm2784349a91.13.2026.07.08.05.50.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 05:51:02 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Takashi Iwai , Tzung-Bi Shih , David Rhodes , Charles Keepax Cc: Liam Girdwood , Jaroslav Kysela , Cheng-Yi Chiang , Guenter Roeck , Benson Leung , Richard Fitzgerald , povik+lin@cutebit.org, u.kleine-koenig@baylibre.com, kuninori.morimoto.gx@renesas.com, christian.ehrhardt@codasip.com, Linus Walleij , Arnd Bergmann , Sakari Ailus , Thorsten Blum , Chris Morgan , Dan Carpenter , Marco Crivellari , Rosen Penev , Weidong Wang , Teguh Sobirin , Val Packett , Luca Weiss , wangdicheng , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, chrome-platform@lists.linux.dev, asahi@lists.linux.dev, Cezary Rojewski , bui duc phuc Subject: [PATCH v4 04/24] ASoC: codecs: arizona: Use guard() for mutex locks Date: Wed, 8 Jul 2026 19:49:41 +0700 Message-ID: <20260708125002.202515-5-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260708125002.202515-1-phucduc.bui@gmail.com> References: <20260708125002.202515-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: asahi@lists.linux.dev 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: Cezary Rojewski Reviewed-by: Charles Keepax Signed-off-by: bui duc phuc --- sound/soc/codecs/arizona.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 8c683b0bb74c..4411165c3734 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -7,6 +7,7 @@ * Author: Mark Brown */ +#include #include #include #include @@ -1158,17 +1159,16 @@ int arizona_dvfs_up(struct snd_soc_component *component, unsigned int flags) struct arizona_priv *priv = snd_soc_component_get_drvdata(component); int ret = 0; - mutex_lock(&priv->dvfs_lock); + guard(mutex)(&priv->dvfs_lock); if (!priv->dvfs_cached && !priv->dvfs_reqs) { ret = arizona_dvfs_enable(component); if (ret) - goto err; + return ret; } priv->dvfs_reqs |= flags; -err: - mutex_unlock(&priv->dvfs_lock); + return ret; } EXPORT_SYMBOL_GPL(arizona_dvfs_up); @@ -1179,7 +1179,7 @@ int arizona_dvfs_down(struct snd_soc_component *component, unsigned int flags) unsigned int old_reqs; int ret = 0; - mutex_lock(&priv->dvfs_lock); + guard(mutex)(&priv->dvfs_lock); old_reqs = priv->dvfs_reqs; priv->dvfs_reqs &= ~flags; @@ -1187,7 +1187,6 @@ int arizona_dvfs_down(struct snd_soc_component *component, unsigned int flags) if (!priv->dvfs_cached && old_reqs && !priv->dvfs_reqs) ret = arizona_dvfs_disable(component); - mutex_unlock(&priv->dvfs_lock); return ret; } EXPORT_SYMBOL_GPL(arizona_dvfs_down); @@ -1199,7 +1198,7 @@ int arizona_dvfs_sysclk_ev(struct snd_soc_dapm_widget *w, struct arizona_priv *priv = snd_soc_component_get_drvdata(component); int ret = 0; - mutex_lock(&priv->dvfs_lock); + guard(mutex)(&priv->dvfs_lock); switch (event) { case SND_SOC_DAPM_POST_PMU: @@ -1222,7 +1221,6 @@ int arizona_dvfs_sysclk_ev(struct snd_soc_dapm_widget *w, break; } - mutex_unlock(&priv->dvfs_lock); return ret; } EXPORT_SYMBOL_GPL(arizona_dvfs_sysclk_ev); @@ -1657,13 +1655,11 @@ static void arizona_wm5102_set_dac_comp(struct snd_soc_component *component, { 0x80, 0x0 }, }; - mutex_lock(&arizona->dac_comp_lock); - - dac_comp[1].def = arizona->dac_comp_coeff; - if (rate >= 176400) - dac_comp[2].def = arizona->dac_comp_enabled; - - mutex_unlock(&arizona->dac_comp_lock); + scoped_guard(mutex, &arizona->dac_comp_lock) { + dac_comp[1].def = arizona->dac_comp_coeff; + if (rate >= 176400) + dac_comp[2].def = arizona->dac_comp_enabled; + } regmap_multi_reg_write(arizona->regmap, dac_comp, -- 2.43.0