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 3CA56CD98E2 for ; Wed, 17 Jun 2026 10:33:41 +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=yE860yX5MeluInu/xHweWVTpSgNi/lSdv92MvT4+EVI=; b=2WP9OXGM0T0OnsYG1CdyYEuod9 vjLCZwWKxQZURRi6fv2Xie4ImTB4dYVwWCRgsvOTeZRreux2ra37w7yzIQuft10GrpM876bq/IfNd e2XccefYsD100sQzLKYcW09nK0gHYbYElCY8WnsQ6pH5q69m60w4cFXTBLt+iDTDJfpHBr4Iu4Ywg GpwUK2VUQ0GlIJyFL7s5cYWTH8xuKtIkO6t0NiM66jqTBzz8EuCibgKqrG/zGLtWp9aPl179as2UE MI3oBe+S4i2llzffpppI4a6rSFv2X7/DDbd7fnvjz06US5RvTGFkbbWqj3BxEFImXeFfR/ty9d7Y5 eY/VREhA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZnaW-0000000H3re-0LzD; Wed, 17 Jun 2026 10:33:40 +0000 Received: from mail-dy1-x132a.google.com ([2607:f8b0:4864:20::132a]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZnaU-0000000H3q1-12UP for linux-mediatek@lists.infradead.org; Wed, 17 Jun 2026 10:33:39 +0000 Received: by mail-dy1-x132a.google.com with SMTP id 5a478bee46e88-30bdb3eb5f0so149711eec.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.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; bh=yE860yX5MeluInu/xHweWVTpSgNi/lSdv92MvT4+EVI=; b=N197lNhINyeRwPZTKBsTGNZGJaemNoR1wsdB0w7M+yi3+JKfFJZRiLFCJuiBKUW4Cv wOBduZJJInufULUHnEkoXnuc+gKWeQJLRjn/U+vKq+YeswM/VMONqCsSm69JeEI/EI7f RvsU3WomXDyaM/avEntZVGTvDFd6FeSA5PkJuHJogfv82OA9vu5egK71ISkFz6ETXDL9 FeD/i4PHOlfhCswk9mgFmeJuEkGIUX/5LkbQYnK9Y5d2w27RJEND7K7idX9M5Xhn85K9 o+0MNquHYuAPTFgAbyb2N5rgGGV1Su91uYsbpILMJR7xym0XVwTPiqeCmpavhOUzexN4 Kpxw== 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=JYlEmtdi9eMbcsPnZUNjKY7ED+uX9gTBtf/xw3bUQ7IWLcUefZqS/qMx2XG3PzgIRS RgaFsKw6eHunHeLI233WGvuCR9IuuxtC+6bixC2TEBPxngqyVOfmbV92K2zYro5YbM9L oVFAPW89CCReVR8WJtTI8QtnGPCPvp5qZfWqWPWLIei5HZvcoZfA6ysgRTb7NNCSEjaj UGW9Rp/HNhmuccVQ26IcvBppSjsb6Zb5uKlsqVQRdkISAFVMstoEGF6XGNc4QmqSJAQo 0e0yx58jImZ9MkwzPmsNGbb1bgf2MUAQSv6vIy7Q/rBNCY29Kejbp+Q3wsqsCE3pt1Rt IdGQ== X-Forwarded-Encrypted: i=1; AFNElJ8URyXeeg89S3BTXTDyW4qGJCah91Ywl6FhP1zSmJ+b9Oh1CrbOR9zsAC7PMRhKrbuVxaowTT5qNFSFWtwSTA==@lists.infradead.org X-Gm-Message-State: AOJu0YxL+EYFNjfIgAC4leKXXqqSQRaCpPR0oXgOMKByeeF0xcPdSgvq a+p4OY5MvsAzYo/Ld29t8v5yprflptj4OdJLFpcCe6YF/7KBHcH6nGvt X-Gm-Gg: AfdE7cn1u6ljBw4MxZRNqazbCScUwvI3ZJ1KLpuQbgv3vvAj+KAtN/RAiz6acPuZQZg fk2CNX/fGM2EdPQ0UIHqe70JIYisrQqNSAT6PlFZZ4peY7kb3UfUsDXKz7BTwXR+R5W3qilJFgL 0+62bzK6X2Xfd19iMkEjmxELNZNsn5mp56rvzCard0er4elZTOha/EaJa97PCBqetXNNNBHHeR6 n7yy0NJidg71NP5Mo37wlagys75gbQgzRW+nGwMNfVr9aDFrUurNLooH9ZqhwyqgaodEkvPsVdX E8P+y5cu7YUu1FQasX0nyLbuvLEAz+UzAbZ2++hncdbivtIJoB5sYTkacRygggQobf/OHt5rnrw k8sw2iFBqTkkS5HETDOQmlz8tF73yBmKSDLAMeM80FnxwG7wFXFK9L9i2r7NPi2TSvjP4vs+SzW LicNNWHSQtl69h6iLxxvczTjSh3FAxGoWiiJZ8Duf3pgzL2vY= 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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260617_033338_295654_F2E40F37 X-CRM114-Status: GOOD ( 11.15 ) 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/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