From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f175.google.com (mail-dy1-f175.google.com [74.125.82.175]) (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 B1A8544E04C for ; Wed, 17 Jun 2026 10:35:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692544; cv=none; b=X43ieNLrACO+5e+ICZjQvg7v0Wzy/tjCAFNBKmrJJmbWc8gSABoF1McOa96iBnKhqBSIcp66UBLMVYDYX1z3ibvDN60FeHBQv48d5s1DLw6jDz5Vez2qMNFwhHSiC3rTnxoLH60Nio56oXbnhqRDhKXcmABYs8LWgA7sLyonnpc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692544; c=relaxed/simple; bh=FvCY6IHEvGanI+XwNJYJXJPRA6+zOndXmAvYxeKo0xE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hs0CC04rt03LnC7sZEtspYj2BlDlcip3t6LtMdQTMHL7W+OEKmdkMFh9ObxAKyHMMZKgmefLsp34CpJwrC906Nib7x1nPSt36MA7bEtF1X9iDK1p0fLQOgWEJGpZW/HxV+MEJZFBZK7YemOAfT+9Ei/P7cwCYpvma7+HoL/2s1w= 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=IPUu+sp7; arc=none smtp.client-ip=74.125.82.175 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="IPUu+sp7" Received: by mail-dy1-f175.google.com with SMTP id 5a478bee46e88-304d8362a58so601376eec.1 for ; Wed, 17 Jun 2026 03:35:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692538; x=1782297338; 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=Y8VWF2SeEtHF667M6jhaZnBwcldxW4ZuQhlBOZBeK1Y=; b=IPUu+sp7OEdVkxu6MbryW3CmrcBFKnyI4smiiowtM8RsbN9zTFnWK1NKez4UY1mgX5 Wgp245mQBEQ66D+ikbWO2EvQKxoM63OY25V519Lea/wK2AHO1gw2fdumGfOydPO25NO6 pgukpju56I6BU30GOyje5jBbpZYFwc7wRxL4kgbJMNOEifnGgt7RugOHFCQXeQNwGgCF mSSN6rE3hDiEVuxP7SblfYRbBmjuHXTNdL21mrLUuFcf9r9ymvowufDdkL/LChtlYchg mDHVCbfGZJaTRbeTpVgHNWHtTGAaYe9M7mw7kd58B7s3/IamGGsBKb2dR68h/St2DIoJ sQ5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692538; x=1782297338; 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=Y8VWF2SeEtHF667M6jhaZnBwcldxW4ZuQhlBOZBeK1Y=; b=QQxCKOTbZq3tg+Sicj7wWznt2UPbgfZrXJiruRmHChiK0uanl0gXcqvCN3mZbSdMCO d1XYejxeYuwhZFZszjOk5afCozWjW4ByXPh7VaU2H0+o95LiFR5Ft/yW03eCF71HU3ps u94DFnCHS6YAB21Hfnrpg8UUQqPYU/AENWUEI94eH6IRFEZuB2bML1RNlPzEKZQdz3/W H+SKlE9rgCWEQUU2L+2WyD/a24p0QcYh5vgTqai/FXkUFO/KMTj7W+ZrBYshVHjVU0yi nXu3wCsJl0mScZ2Zu2+rxcQ81P7gpE7hMwlMOv4RobP6wZKFzW99MREfk+l89zyukFE2 wH6w== X-Forwarded-Encrypted: i=1; AFNElJ/cSXo9yjPQ0ezLZiNF27HmbhcuLBhEk0u3tDxzGPO/RcvW1FNhD9VyTxgrgzvxgthT+pNkMw==@lists.linux.dev X-Gm-Message-State: AOJu0Yyvj/7nMt9qb9eDZlzZB2/ZSZbHfZaewZV49fpOpF8xvoKuwLcs MNZDKimdt3XDImnGI52Chjn/knkVIpzpRxd/Nhjy/qL0GLZwbfkB2xPt X-Gm-Gg: AfdE7ckDKg3Q6h/rYhlrEq0deoB3qdVpyv01qJ7iL56EkIAj2ZF0+pFGP/QqAApcDdN bhqbFA5J2L6v/k0gDj+pC4doHwaaoorC5UkQ1YabQ90r3iqJOxb+N1XRtpExRyiVTHb6zuW/LCD DNeaUSY/QhC1P4cubTVs8c41LTwm9/aqSiKri6GV2EJpjWxgaxvpnWncrMAGnkzKBK+258Hm7xf v117s78T9AVu1U5QpjQrkt9UdSC8zwGfSR7cBgcRXVm3RJteyoRIP4DUAKThuTht1gbMLyIAvDE uOx3U0m5RHl8VBEe+UeYEZCNulP4yEkjTPTErGOFbGp2HkuN8PGvAywWeImhsvX07lGQt0rov9h Tq4Tc2HmyIHORxYVLVk/AtnkeYoA63iZpN5BfSXfcUgj+CrZO+IBKkiBNwlyd2+fy8wqSxF0TAQ fQHg8cIz3IVGlQ8HCEvYlZ7y5bwWwYlQfboCFjzVGH9z64yhM= X-Received: by 2002:a05:7300:6420:b0:304:bd90:b88f with SMTP id 5a478bee46e88-30bcf5ff5abmr1289238eec.9.1781692538389; Wed, 17 Jun 2026 03:35:38 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d0828sm24616275eec.10.2026.06.17.03.35.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:35:38 -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 17/78] ASoC: codecs: cs43130: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:31:34 +0700 Message-ID: <20260617103235.449609-18-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/cs43130.c | 96 +++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 49 deletions(-) diff --git a/sound/soc/codecs/cs43130.c b/sound/soc/codecs/cs43130.c index e7b06f962790..5e7472e9e107 100644 --- a/sound/soc/codecs/cs43130.c +++ b/sound/soc/codecs/cs43130.c @@ -818,26 +818,26 @@ static int cs43130_dsd_hw_params(struct snd_pcm_substream *substream, unsigned int required_clk; u8 dsd_speed; - mutex_lock(&cs43130->clk_mutex); - if (!cs43130->clk_req) { - /* no DAI is currently using clk */ - if (!(CS43130_MCLK_22M % params_rate(params))) - required_clk = CS43130_MCLK_22M; - else - required_clk = CS43130_MCLK_24M; + scoped_guard(mutex, &cs43130->clk_mutex) { + if (!cs43130->clk_req) { + /* no DAI is currently using clk */ + if (!(CS43130_MCLK_22M % params_rate(params))) + required_clk = CS43130_MCLK_22M; + else + required_clk = CS43130_MCLK_24M; + + cs43130_set_pll(component, 0, 0, cs43130->mclk, required_clk); + if (cs43130->pll_bypass) + cs43130_change_clksrc(component, CS43130_MCLK_SRC_EXT); + else + cs43130_change_clksrc(component, CS43130_MCLK_SRC_PLL); + } - cs43130_set_pll(component, 0, 0, cs43130->mclk, required_clk); - if (cs43130->pll_bypass) - cs43130_change_clksrc(component, CS43130_MCLK_SRC_EXT); - else - cs43130_change_clksrc(component, CS43130_MCLK_SRC_PLL); + cs43130->clk_req++; + if (cs43130->clk_req == 2) + cs43130_pcm_dsd_mix(true, cs43130->regmap); } - cs43130->clk_req++; - if (cs43130->clk_req == 2) - cs43130_pcm_dsd_mix(true, cs43130->regmap); - mutex_unlock(&cs43130->clk_mutex); - switch (params_rate(params)) { case 176400: dsd_speed = 0; @@ -881,26 +881,26 @@ static int cs43130_hw_params(struct snd_pcm_substream *substream, unsigned int required_clk; u8 dsd_speed; - mutex_lock(&cs43130->clk_mutex); - if (!cs43130->clk_req) { - /* no DAI is currently using clk */ - if (!(CS43130_MCLK_22M % params_rate(params))) - required_clk = CS43130_MCLK_22M; - else - required_clk = CS43130_MCLK_24M; + scoped_guard(mutex, &cs43130->clk_mutex) { + if (!cs43130->clk_req) { + /* no DAI is currently using clk */ + if (!(CS43130_MCLK_22M % params_rate(params))) + required_clk = CS43130_MCLK_22M; + else + required_clk = CS43130_MCLK_24M; + + cs43130_set_pll(component, 0, 0, cs43130->mclk, required_clk); + if (cs43130->pll_bypass) + cs43130_change_clksrc(component, CS43130_MCLK_SRC_EXT); + else + cs43130_change_clksrc(component, CS43130_MCLK_SRC_PLL); + } - cs43130_set_pll(component, 0, 0, cs43130->mclk, required_clk); - if (cs43130->pll_bypass) - cs43130_change_clksrc(component, CS43130_MCLK_SRC_EXT); - else - cs43130_change_clksrc(component, CS43130_MCLK_SRC_PLL); + cs43130->clk_req++; + if (cs43130->clk_req == 2) + cs43130_pcm_dsd_mix(true, cs43130->regmap); } - cs43130->clk_req++; - if (cs43130->clk_req == 2) - cs43130_pcm_dsd_mix(true, cs43130->regmap); - mutex_unlock(&cs43130->clk_mutex); - switch (dai->id) { case CS43130_ASP_DOP_DAI: case CS43130_XSP_DOP_DAI: @@ -988,14 +988,13 @@ static int cs43130_hw_free(struct snd_pcm_substream *substream, struct snd_soc_component *component = dai->component; struct cs43130_private *cs43130 = snd_soc_component_get_drvdata(component); - mutex_lock(&cs43130->clk_mutex); + guard(mutex)(&cs43130->clk_mutex); cs43130->clk_req--; if (!cs43130->clk_req) { /* no DAI is currently using clk */ cs43130_change_clksrc(component, CS43130_MCLK_SRC_RCO); cs43130_pcm_dsd_mix(false, cs43130->regmap); } - mutex_unlock(&cs43130->clk_mutex); return 0; } @@ -2132,18 +2131,18 @@ static void cs43130_imp_meas(struct work_struct *wk) cs43130->hpload_done = false; - mutex_lock(&cs43130->clk_mutex); - if (!cs43130->clk_req) { - /* clk not in use */ - cs43130_set_pll(component, 0, 0, cs43130->mclk, CS43130_MCLK_22M); - if (cs43130->pll_bypass) - cs43130_change_clksrc(component, CS43130_MCLK_SRC_EXT); - else - cs43130_change_clksrc(component, CS43130_MCLK_SRC_PLL); - } + scoped_guard(mutex, &cs43130->clk_mutex) { + if (!cs43130->clk_req) { + /* clk not in use */ + cs43130_set_pll(component, 0, 0, cs43130->mclk, CS43130_MCLK_22M); + if (cs43130->pll_bypass) + cs43130_change_clksrc(component, CS43130_MCLK_SRC_EXT); + else + cs43130_change_clksrc(component, CS43130_MCLK_SRC_PLL); + } - cs43130->clk_req++; - mutex_unlock(&cs43130->clk_mutex); + cs43130->clk_req++; + } regmap_read(cs43130->regmap, CS43130_INT_STATUS_4, ®); @@ -2215,12 +2214,11 @@ static void cs43130_imp_meas(struct work_struct *wk) regmap_multi_reg_write(cs43130->regmap, hp_cln_seq, ARRAY_SIZE(hp_cln_seq)); - mutex_lock(&cs43130->clk_mutex); + guard(mutex)(&cs43130->clk_mutex); cs43130->clk_req--; /* clk not in use */ if (!cs43130->clk_req) cs43130_change_clksrc(component, CS43130_MCLK_SRC_RCO); - mutex_unlock(&cs43130->clk_mutex); } static irqreturn_t cs43130_irq_thread(int irq, void *data) -- 2.43.0