From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f176.google.com (mail-dy1-f176.google.com [74.125.82.176]) (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 764D23F58C9 for ; Wed, 17 Jun 2026 10:33:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692420; cv=none; b=uVQF030RYG32onfClbVnOYhRfLJ/LRm0PRCpzxkhaNzjjSxi0luBOKPAWarKkfC79pcJS7y+RIhqgdWjArcLgF+u3qNs3dT67wk2V7JXh8WWeQhihjaylSx7Z2+UZwTqC7kQIOC762zBGl6avZHmauMJ5Iq/sXqKimFED5AlQik= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692420; c=relaxed/simple; bh=GZQRr3sPIaME2wNVw97IuSX0NKDx0HvZiZq995LglkE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f9agdlusRQIlAu0ZqHPaJmIcZdkprUDwCQwbEhSYiEVjr/Ho4VyOobZmKVrpPm3NxUOrRnfn6jiLhRYSKbbiGQhStidYnsj6yuKxLiGtVsLNjSiGgtv7yT+WML0lLl0WiiOc7yqxHBgDxgoamWj5ACQZbcCifL7RiS/g2cbxjjo= 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=E7epxCns; arc=none smtp.client-ip=74.125.82.176 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="E7epxCns" Received: by mail-dy1-f176.google.com with SMTP id 5a478bee46e88-30bdb3eb5f0so149710eec.0 for ; Wed, 17 Jun 2026 03:33:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692418; x=1782297218; 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=yE860yX5MeluInu/xHweWVTpSgNi/lSdv92MvT4+EVI=; b=E7epxCnszZoJ/TSLUOZnFex0eloZguywNgOKdwVy7Q7tz+W8mxv8Gq4wha99B67tgQ bDHuABmcVncUcUTMH3RVqVqnuPDfQI04osmNvQ7QM4XVEM9GCUchbuevKREAr3S5v9Cf 7T1qY6SeSdSiCQ41xPxbBsjSJuL6uM2eGWx1gtGt7m3o5NvcOH+79pb59dd9ci3/B5cx neMPuRetUKIBQ8+Y8nPI1/CJb3QfWvRiITl6iO8/rQ6Tx5DQnf2pMrpb+pqIVMkWCV/D PlzCO9X5J2c8oAx68hGoaYYShqx0sXWR0KcsNDm1oYhM7dkn6LZEASxG4W6cOGIKERPv Jgqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692418; x=1782297218; 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=yE860yX5MeluInu/xHweWVTpSgNi/lSdv92MvT4+EVI=; b=IzujjmxjGsfCXrw9hXRVf/DXYUvLiLkwRjx0l01LAu+VMAPuK0UQ7/I9RffsZ/M+/1 51037hTvb+z4ockkCjpYgXuVGt6avayWRhnudGeFYvU5nk8od1k3pjVBNNVoYaiG+cYz a4CSi95ZrL4l8+ixdPndCIM8n9NidhNv0o/+eo/HJfNSm04zE5MYF3R77YX8W/H2EF7h jHCQ8TUnBE7IBz/gcC/dJJLmZB9FxSpQvEv9uQH5D9yNqWJxtjYmc4b16yiSTW5LNaQm 2GEbKvfbPs2TIFoKA8s4CKf1v6bDbp3GzmaiPYJI9wPzMY2VzIMd5LK2+YQV6rYW1UHN 1fGA== X-Forwarded-Encrypted: i=1; AFNElJ+Qpl9MEh87r3Sn56Y57balyAETUJa6YlFvVacfKhGM8xxG47bNFOwy0qzS+PEvJZ2zBku+Ag==@lists.linux.dev X-Gm-Message-State: AOJu0YxfgpxztYaV0yosIdKy53KX6FAeyTichU7AO0nZcsuD6Wl+4Nrm /mvuUWBl7J/riKuJFzzDqjbjYD5d+GNAEsKsE4oYiRQBeJD/trVyjHTR X-Gm-Gg: AfdE7ck87b3ARzioO6YWTCBwBgMXgm/444zqhLiraRD3+rIDDWYPRAoqwywCznS8HcY M7VW/M1Kfrih5/VaHcBrUYYbzGnKMot39gHkR9F3hxGaQRM5sATB9nbD10mghsx8g9bguG5jPIO rkwyvoJQ08N1KaEVxMcPax8FqbihtKEtRgav7RjH/E4kmDURCXZdydSL065nDuKyUAt8TCDWz0f HCcz12iR0mL1/cOWO0I0eq9ifms2WcF7J7SNdJUuEV4kLaA0tSAe+0u5XHlXB8PGaBrtUNoNQJa ehvDP1ZVMFm13+I/k9voxMHgvd1MbU8iuk5TDG3fUcToU95znNC0DChms+TGqqRCqnB/jj5LDXi 5PePt4OfMfRA5j0cX0p0VpDwenOGxLl7bC+G8rqNSNybrC7zxDIDPbRki1dia/0zBvUho4CYaXT AQuHdTwm27LXH4fspPKT45zZ0TWWIWRvsirOSwVA54od5WFkk= X-Received: by 2002:a05:7300:a599:b0:307:286d:c14e with SMTP id 5a478bee46e88-30bcf72520emr1179356eec.17.1781692417477; Wed, 17 Jun 2026 03:33:37 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d0828sm24616275eec.10.2026.06.17.03.33.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:33:37 -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 04/78] ASoC: codecs: arizona: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:31:21 +0700 Message-ID: <20260617103235.449609-5-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> 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. Signed-off-by: bui duc phuc --- sound/soc/codecs/arizona.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 8c683b0bb74c..77bd02def9c7 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -1158,17 +1158,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 +1178,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 +1186,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 +1197,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 +1220,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 +1654,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