From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f177.google.com (mail-dy1-f177.google.com [74.125.82.177]) (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 709CA4921AB for ; Wed, 17 Jun 2026 10:40:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692816; cv=none; b=G4K83pEIUpO1b4A6qrGeCvTGEmXcVpKawC9Uf2E5t5pAevNy104SQ1LANihAyxQJI3/eVBKIGvXQ7lYkozrCN2RoU2TzfQYcCP/DtPJSKd7QD+5SyVAK4EnfuecMNJLgOnPexVUB0w3+kCNZmWfo/7cojgce5t7JPqAUM9fWJxU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692816; c=relaxed/simple; bh=HA70qQj+Tv7Z0n0QLohCr2gojqtmXaULBzIHTTYiHCg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uovWQHqFbyfY0hX/RBEMeuLddlEK/41HcftGAxpmhjvE8D1giEGoGamq+LOqfhAURqrLoH5Y1tHsOB3T2JoTzUMMiHguiM04Zo+d9hm6iVXkgsrFON8ZazsQL4aAOFEU0Amem0uiHQhJsPgSFaeZM3MtWGggij+Ca4ph0asElME= 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=nwpnwTz3; arc=none smtp.client-ip=74.125.82.177 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="nwpnwTz3" Received: by mail-dy1-f177.google.com with SMTP id 5a478bee46e88-307d0405e07so8461950eec.1 for ; Wed, 17 Jun 2026 03:40:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692815; x=1782297615; 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=C2Fk9ynsoms6SbafZDmk8Pz5BAewC5p9SQQnIzzSYps=; b=nwpnwTz3p3nTOyf+VsjKzrL00y5zjFVTazCCnLPkDsPTvBOOA6ETQwpA82t3T9ENlh 5J64PUfScsQ0al3CjWVWzYHrqqKMD9xgrZEykKEtHq1t06kbpUzSb/LSrcLXx73rvL2k TsmvqqlcBFF++dusPO7yhbMqIY6KJq2coeKLfKxc6eODTWje0h6MB/NlouUFgVh5ZX3z 96sK7Pz+zKQQQ1buNKufv8ADe1Clfv9DzHmyAx/pqq8mwq8mWL9vatfM9+aBZliLusAv QiuGO4UcN8M5UE6uJjTLvWbyMiBb2+ZaZyN35C622j8Y2EHysXvNGo8G2qYTaU3xoruB k5bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692815; x=1782297615; 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=C2Fk9ynsoms6SbafZDmk8Pz5BAewC5p9SQQnIzzSYps=; b=Aatf99qtXa9WNFcrT+Nd1dgOIFvi3N9yHgujgrNPJdi1gQeJZIO9w9dwHg21vaYzty 07HMNE4f4poOqXz0LLgq+eMlCAUQ1v5Rfzzz9M6l7mKU1GUsBMXuK7H/L8uZmLSXBYLm HXq34/C8vg4AvuWJv6kJiELLlJfzZNs2LOqORMBzR9QvjcspkHhCtLL76T5jVP7pD8Ib sSAL5hRVoxGFZ5MC45wURJ5NMoEohw8OObr1EGQviJWgJv/sOnoiTmGGNbL+XPuVNMbM 08+mQUs2wvqWDo/wKS+8uJH5a2KOFTGw1P7Uu+XzbfZQ1kvXsnv/o+DIAlklhAB5Cy3E fOig== X-Forwarded-Encrypted: i=1; AFNElJ/GLyCnYgVjZmEONTvtnimN3rnJygKqXGoP0NBGCYPk0LIL0pZfSQ9RSlQ1UrhMPnpwmOVdsw==@lists.linux.dev X-Gm-Message-State: AOJu0YxOOSr6qqPHGMekQM6cmlnf5hM7OqwQTn0oHZ58OeTsOrH6Ej5b AxDa1P4qq2KSVvzLOCeBN6H5tavWcF/AD8MJxSIA0uHlwmW8swTKHdKb X-Gm-Gg: AfdE7clesl4KDOzSsf7eM/tKFNDt+8lJuvi0FkioJ2O89nLTQlL2XGr7qd7j0hILu8f DQUdCvPdOkCCYrD/Gvl5HEWbp0gTnSafzZTolKVxctMI4Twamtm1Eu+1uyH6Di5DBitfoBQ5Wrq CbKFtJc2bbO2HtRplVTOp/NaitjMRflF0OcmR9/AJ1Lp16hbyuX6TRIBNcRQQ2cwkzPidNQXj01 u8MBwQVnBGTJ1D9Y9jpTAp7f8bSgVcLr6fSOYS2OIQL5f+ld355agrHvXFacP74ewHh44zBgX51 RBG80uwU5DlHMzNUaOHJNTzHXEpFsA869toZql8q2SjS1o88CSIs4Fk9PcPE+77heOyGeF28YL/ hOzKKDfUtGpiolRwdEnXmEGspcDKZ791ePjjEvGBvsYf+3d/D/P+VDtvhjFwk5FpF0+RaTny03s r0v/50p9LtCvk8pENuECyTi8+D1O+9pjdMmyTxCnWrMCKa3Xo= X-Received: by 2002:a05:7301:5f8b:b0:2ce:25be:c8e8 with SMTP id 5a478bee46e88-30bca0ab35amr1737019eec.17.1781692814574; Wed, 17 Jun 2026 03:40:14 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d0828sm24616275eec.10.2026.06.17.03.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:40:14 -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 46/78] ASoC: codecs: rt5682: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:32:03 +0700 Message-ID: <20260617103235.449609-47-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/rt5682-sdw.c | 23 +++++++++++------------ sound/soc/codecs/rt5682.c | 4 +--- sound/soc/codecs/rt5682s.c | 16 ++++------------ 3 files changed, 16 insertions(+), 27 deletions(-) diff --git a/sound/soc/codecs/rt5682-sdw.c b/sound/soc/codecs/rt5682-sdw.c index ec2a35a0cacd..2b23c84cf203 100644 --- a/sound/soc/codecs/rt5682-sdw.c +++ b/sound/soc/codecs/rt5682-sdw.c @@ -660,12 +660,11 @@ static int rt5682_interrupt_callback(struct sdw_slave *slave, dev_dbg(&slave->dev, "%s control_port_stat=%x", __func__, status->control_port); - mutex_lock(&rt5682->disable_irq_lock); + guard(mutex)(&rt5682->disable_irq_lock); if (status->control_port & 0x4 && !rt5682->disable_irq) { mod_delayed_work(system_power_efficient_wq, &rt5682->jack_detect_work, msecs_to_jiffies(rt5682->irq_work_delay_time)); } - mutex_unlock(&rt5682->disable_irq_lock); return 0; } @@ -736,11 +735,11 @@ static int rt5682_dev_system_suspend(struct device *dev) * deferred work completes and before the parent disables * interrupts on the link */ - mutex_lock(&rt5682->disable_irq_lock); - rt5682->disable_irq = true; - ret = sdw_update_no_pm(slave, SDW_SCP_INTMASK1, - SDW_SCP_INT1_IMPL_DEF, 0); - mutex_unlock(&rt5682->disable_irq_lock); + scoped_guard(mutex, &rt5682->disable_irq_lock) { + rt5682->disable_irq = true; + ret = sdw_update_no_pm(slave, SDW_SCP_INTMASK1, + SDW_SCP_INT1_IMPL_DEF, 0); + } if (ret < 0) { /* log but don't prevent suspend from happening */ @@ -760,12 +759,12 @@ static int rt5682_dev_resume(struct device *dev) return 0; if (!slave->unattach_request) { - mutex_lock(&rt5682->disable_irq_lock); - if (rt5682->disable_irq == true) { - sdw_write_no_pm(slave, SDW_SCP_INTMASK1, SDW_SCP_INT1_IMPL_DEF); - rt5682->disable_irq = false; + scoped_guard(mutex, &rt5682->disable_irq_lock) { + if (rt5682->disable_irq == true) { + sdw_write_no_pm(slave, SDW_SCP_INTMASK1, SDW_SCP_INT1_IMPL_DEF); + rt5682->disable_irq = false; + } } - mutex_unlock(&rt5682->disable_irq_lock); } ret = sdw_slave_wait_for_init(slave, RT5682_PROBE_TIMEOUT); diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index 4b82e07d3b2c..7a7dd99777c7 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -3125,7 +3125,7 @@ void rt5682_calibrate(struct rt5682_priv *rt5682) { int value, count; - mutex_lock(&rt5682->calibrate_mutex); + guard(mutex)(&rt5682->calibrate_mutex); rt5682_reset(rt5682); regmap_write(rt5682->regmap, RT5682_I2C_CTRL, 0x000f); @@ -3175,8 +3175,6 @@ void rt5682_calibrate(struct rt5682_priv *rt5682) regmap_write(rt5682->regmap, RT5682_CALIB_ADC_CTRL, 0x2005); regmap_write(rt5682->regmap, RT5682_STO1_ADC_MIXER, 0xc0c4); regmap_write(rt5682->regmap, RT5682_CAL_REC, 0x0c0c); - - mutex_unlock(&rt5682->calibrate_mutex); } EXPORT_SYMBOL_GPL(rt5682_calibrate); diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c index 3624067950c0..4510f59f68fb 100644 --- a/sound/soc/codecs/rt5682s.c +++ b/sound/soc/codecs/rt5682s.c @@ -648,7 +648,7 @@ static void rt5682s_sar_power_mode(struct snd_soc_component *component, int mode { struct rt5682s_priv *rt5682s = snd_soc_component_get_drvdata(component); - mutex_lock(&rt5682s->sar_mutex); + guard(mutex)(&rt5682s->sar_mutex); switch (mode) { case SAR_PWR_SAVING: @@ -695,8 +695,6 @@ static void rt5682s_sar_power_mode(struct snd_soc_component *component, int mode dev_err(component->dev, "Invalid SAR Power mode: %d\n", mode); break; } - - mutex_unlock(&rt5682s->sar_mutex); } static void rt5682s_enable_push_button_irq(struct snd_soc_component *component) @@ -2534,7 +2532,7 @@ static int rt5682s_wclk_prepare(struct clk_hw *hw) if (!rt5682s_clk_check(rt5682s)) return -EINVAL; - mutex_lock(&rt5682s->wclk_mutex); + guard(mutex)(&rt5682s->wclk_mutex); snd_soc_component_update_bits(component, RT5682S_PWR_ANLG_1, RT5682S_PWR_VREF2 | RT5682S_PWR_FV2 | RT5682S_PWR_MB, @@ -2556,8 +2554,6 @@ static int rt5682s_wclk_prepare(struct clk_hw *hw) rt5682s->wclk_enabled = 1; - mutex_unlock(&rt5682s->wclk_mutex); - return 0; } @@ -2570,7 +2566,7 @@ static void rt5682s_wclk_unprepare(struct clk_hw *hw) if (!rt5682s_clk_check(rt5682s)) return; - mutex_lock(&rt5682s->wclk_mutex); + guard(mutex)(&rt5682s->wclk_mutex); if (!rt5682s->jack_type) snd_soc_component_update_bits(component, RT5682S_PWR_ANLG_1, @@ -2585,8 +2581,6 @@ static void rt5682s_wclk_unprepare(struct clk_hw *hw) rt5682s_set_pllb_power(rt5682s, 0); rt5682s->wclk_enabled = 0; - - mutex_unlock(&rt5682s->wclk_mutex); } static unsigned long rt5682s_wclk_recalc_rate(struct clk_hw *hw, @@ -2997,7 +2991,7 @@ static void rt5682s_calibrate(struct rt5682s_priv *rt5682s) { unsigned int count, value; - mutex_lock(&rt5682s->calibrate_mutex); + guard(mutex)(&rt5682s->calibrate_mutex); regmap_write(rt5682s->regmap, RT5682S_PWR_ANLG_1, 0xaa80); usleep_range(15000, 20000); @@ -3034,8 +3028,6 @@ static void rt5682s_calibrate(struct rt5682s_priv *rt5682s) regmap_write(rt5682s->regmap, RT5682S_PWR_DIG_1, 0x00c0); regmap_write(rt5682s->regmap, RT5682S_PWR_ANLG_1, 0x0800); regmap_write(rt5682s->regmap, RT5682S_GLB_CLK, 0x0000); - - mutex_unlock(&rt5682s->calibrate_mutex); } static const struct regmap_config rt5682s_regmap = { -- 2.43.0