From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 BE9B13EDAD6 for ; Tue, 30 Jun 2026 06:38:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801527; cv=none; b=p5iG/Y9m19aKyRvAhxZ8FSveepwbDwmcTnuDwcZaL5KA2JvJU1JjSARpyIQtAV33ja98ZGoU15ZCpXVa2/IogP2noDzN3S2Z67vvd8rcYKflv0YuRAINx9MSS+mI2EfzwhMfeY5eKnG34ogIpcpEQGTtJeqbFZ55VzVRzZXWa/I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801527; c=relaxed/simple; bh=R5dedIMDTwE2cId9qK/qWI3uZybefPwOuh0iBG5LWW4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EwsVACE4Rk/l3B9/foAwlpFfgtc6xlbNq/VPBq/Rgfev1LaFcbd0S5u2WV0gIphZhx6jZGp1m8ZsNoWDlBPhwbfFKoO+ERvQ2y31b30mJLWZQJfA9LxkDKBpjJn2IZIhYnONtP3LdQ13pEkDlXgE63l7tzeQPbvNc1Byjeqp5eA= 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=pSyxtejb; arc=none smtp.client-ip=209.85.210.169 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="pSyxtejb" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-84780c95e2eso1182354b3a.3 for ; Mon, 29 Jun 2026 23:38:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801520; x=1783406320; darn=vger.kernel.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=jvHEcHt0Pv/b75XSblH4phF6+1Nj638qki4oB9IDwxk=; b=pSyxtejbUyPWBPHkvs0T3oNB91aDxlULEMoLv/YKBNoaIMoGrt/9a74SdPfi+nq1ce dyTTIkHJknZIV8KpJYYoRufAFhSM6yZA2/vpp8lDkJds6rG8ZHFPRvUx2wBZ4crROJ11 KbJfTqn5O7o48QgNgESm3kZ70w/u0hIw1OxziCOH+jnJKvtEEKiqHVNRSgqN7kBPPbUP zpMvVANkQld0Gi5cDRpK0NOMyqDNQA4Vkio+sVhUnSzYumU1k77E4IYCOAnB+dMNbXWy r9fwdjXz+LouMFpiYyq90WazGkHARjlEy3+Ull/wVMdUKzxieIY2jCJfE9bco6yCm274 H9dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801520; x=1783406320; 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=jvHEcHt0Pv/b75XSblH4phF6+1Nj638qki4oB9IDwxk=; b=rtO4qlCbpH4ROzXR+EjkjZ5tZsG9my/7qSzI/3Nv5v5+t/Vb0b3/dg7veT2tCiNPQ+ eNfMbBwiQLOZYp1pakXzVKuDp15LszrMbtX0Fc2Zn33ueJqdxzYKGtMgPQl2hBmzt0ez o2s9MzmzhtykTTv2lIfJ+2dz7VtDE9Erc0KsWXhBBLQGnlDpAP5hU7rQPoKeJp6xZwAo DeTXlYz6aXz8EME8ng2jCC97TDpcSWgOaVK82Laer/h/7n3kcSM3s10WqqN/5BdHSh1u 1aoPbtiRnzs6udiGoFx2drTLpM/TiF8QESack1GyUEB+3uQO1BmjuZ5KkRNjeYDOr03b RO8A== X-Forwarded-Encrypted: i=1; AHgh+Ro4Xm6cF8wXmWAYt66Ixi7sLDRTxAZeD+tLrJF43eaP/wBqqG0wtPTqfmiX6iyMyg/l+3x/I7I+vDKr9qA=@vger.kernel.org X-Gm-Message-State: AOJu0YwsDpIfoIDcKhaQt/8sNr4bl2VSrHph634Hjs+IYzaxeHdelrGK 0E2AvxnjACUyn0YkZdkePc0DOH2q9MevYMgiQz00EGa2YSWvoSs9B7Fv X-Gm-Gg: AfdE7cl+ifsMgv8pTwUD6Uxx9K0uIBr56QYb/681xOoDkJuuVT16JvaaPyEAk27CHPz ZTOedcF1J0YCjAg1TT/wddWwi8h5/edVy28sRJWY+17caDE5foQxcSzl7P4Viteq1xpQa8BXdcB xVBPxGlLHW8fmZrtaEiVfhC8uFnNAInJDasmSrAZbemHpAawdoF+ZGwuNqcWCpJDnHm38eq7fS9 zBgKvMVjFREIU1epb+91l9rh5oR+I9zGjhsN5pwlewpJA6lAoK3Yzb/rqp3CgP45DbCz/u/R3hW 5tNa7vTLky0lxebwzAPqOjRSq8zf0LElT4SqQ+I+QFAIB3ecZt5hyQ3pmn4P6ftSSql72VyG56Q 6cSjBqNf08abJrogUu82zCPzONxWMaTRsDhO5/6emmVekaDcg3U+Xtl1tnkhhI1172g7DXEKR6X /vsrNE6Ld5Udfspt9wDyEmKyN/+V045z7oElbIaPhdZUXGMnM= X-Received: by 2002:a05:6a00:44ca:b0:845:d285:3b67 with SMTP id d2e1a72fcca58-8479f26f9b7mr1978158b3a.51.1782801519609; Mon, 29 Jun 2026 23:38:39 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a02cd237sm1165061b3a.32.2026.06.29.23.38.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:38:39 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Takashi Iwai , Nick Li , Herve Codina Cc: Support Opensource , Liam Girdwood , Jaroslav Kysela , Srinivas Kandagatla , Charles Keepax , Richard Fitzgerald , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Linus Walleij , Kuninori Morimoto , u.kleine-koenig@baylibre.com, Zhang Yi , Marco Crivellari , Kees Cook , HyeongJun An , Arnd Bergmann , Qianfeng Rong , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bui duc phuc Subject: [PATCH 25/27] ASoC: codecs: rt712: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:47 +0700 Message-ID: <20260630063449.503996-26-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260630063449.503996-1-phucduc.bui@gmail.com> References: <20260630063449.503996-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org 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/rt712-sdca-sdw.c | 30 ++++++++++++++++-------------- sound/soc/codecs/rt712-sdca.c | 8 +++----- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sound/soc/codecs/rt712-sdca-sdw.c b/sound/soc/codecs/rt712-sdca-sdw.c index 2787524c796e..e784e8b7d167 100644 --- a/sound/soc/codecs/rt712-sdca-sdw.c +++ b/sound/soc/codecs/rt712-sdca-sdw.c @@ -6,6 +6,7 @@ // // +#include #include #include #include @@ -428,13 +429,13 @@ static int rt712_sdca_dev_system_suspend(struct device *dev) * deferred work completes and before the parent disables * interrupts on the link */ - mutex_lock(&rt712_sdca->disable_irq_lock); - rt712_sdca->disable_irq = true; - ret1 = sdw_update_no_pm(slave, SDW_SCP_SDCA_INTMASK1, - SDW_SCP_SDCA_INTMASK_SDCA_0, 0); - ret2 = sdw_update_no_pm(slave, SDW_SCP_SDCA_INTMASK2, - SDW_SCP_SDCA_INTMASK_SDCA_8, 0); - mutex_unlock(&rt712_sdca->disable_irq_lock); + scoped_guard(mutex, &rt712_sdca->disable_irq_lock) { + rt712_sdca->disable_irq = true; + ret1 = sdw_update_no_pm(slave, SDW_SCP_SDCA_INTMASK1, + SDW_SCP_SDCA_INTMASK_SDCA_0, 0); + ret2 = sdw_update_no_pm(slave, SDW_SCP_SDCA_INTMASK2, + SDW_SCP_SDCA_INTMASK_SDCA_8, 0); + } if (ret1 < 0 || ret2 < 0) { /* log but don't prevent suspend from happening */ @@ -456,14 +457,15 @@ static int rt712_sdca_dev_resume(struct device *dev) return 0; if (!slave->unattach_request) { - mutex_lock(&rt712->disable_irq_lock); - if (rt712->disable_irq == true) { - - sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK1, SDW_SCP_SDCA_INTMASK_SDCA_0); - sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK2, SDW_SCP_SDCA_INTMASK_SDCA_8); - rt712->disable_irq = false; + scoped_guard(mutex, &rt712->disable_irq_lock) { + if (rt712->disable_irq) { + sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK1, + SDW_SCP_SDCA_INTMASK_SDCA_0); + sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK2, + SDW_SCP_SDCA_INTMASK_SDCA_8); + rt712->disable_irq = false; + } } - mutex_unlock(&rt712->disable_irq_lock); } ret = sdw_slave_wait_for_init(slave, RT712_PROBE_TIMEOUT); diff --git a/sound/soc/codecs/rt712-sdca.c b/sound/soc/codecs/rt712-sdca.c index 4796fce084ff..5ab1d3961409 100644 --- a/sound/soc/codecs/rt712-sdca.c +++ b/sound/soc/codecs/rt712-sdca.c @@ -6,6 +6,7 @@ // // +#include #include #include #include @@ -79,7 +80,7 @@ static int rt712_sdca_calibration(struct rt712_sdca_priv *rt712) int chk_cnt = 100; int ret = 0; - mutex_lock(&rt712->calibrate_mutex); + guard(mutex)(&rt712->calibrate_mutex); dev = regmap_get_device(regmap); /* Set HP-JD source from JD1 */ @@ -126,7 +127,6 @@ static int rt712_sdca_calibration(struct rt712_sdca_priv *rt712) /* Release HP-JD, EN_CBJ_TIE_GL/R open, en_osw gating auto done bit */ rt712_sdca_index_write(rt712, RT712_VENDOR_REG, RT712_DIGITAL_MISC_CTRL4, 0x0010); - mutex_unlock(&rt712->calibrate_mutex); dev_dbg(dev, "%s calibration complete, ret=%d\n", __func__, ret); return ret; } @@ -403,7 +403,7 @@ static void rt712_sdca_btn_check_handler(struct work_struct *work) static void rt712_sdca_jack_init(struct rt712_sdca_priv *rt712) { - mutex_lock(&rt712->calibrate_mutex); + guard(mutex)(&rt712->calibrate_mutex); if (rt712->hs_jack) { /* Enable HID1 event & set button RTC mode */ @@ -450,8 +450,6 @@ static void rt712_sdca_jack_init(struct rt712_sdca_priv *rt712) dev_dbg(&rt712->slave->dev, "in %s disable\n", __func__); } - - mutex_unlock(&rt712->calibrate_mutex); } static int rt712_sdca_set_jack_detect(struct snd_soc_component *component, -- 2.43.0