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 E64BEC43458 for ; Wed, 8 Jul 2026 14:22:55 +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=opfO1uNasWbxDk0QOATGHi4cTsmB3lXCvlDICGsJtuc=; b=Q5WUR4Ts1P33PMnmVtLqdaPviq cALiKeC9r/HPe+G8z+a+FYgEyA6SRMUKI/KTaJV7U4n08GbMKMoKknKauFPfJwQo0xHemrREsYAOv KkSMTXcCznJQLxGXgsc/8btEE6+WDCrapSG+SSk1ZNYjicxmQgWMsUqgW9uK0TWvnp2sLtAHffTIN QqUxyU40p6k1dTR/2nEGF2PxZS54dHlaEgygcJaA3r7Vj9pxBtA3g2unJhvnrFbzPId1Fpwrnuv4E 2GabxVUE2i01H+SUzF361vzEEj3jNiIx8gGbc96ohi/ApKFBY1JrOC8h/Rfpwxr5I9X+OJBqiLYiP bw+DO6qA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1whTAn-0000000HIxB-18wd; Wed, 08 Jul 2026 14:22:49 +0000 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1whTAa-0000000HIkq-01pU for linux-arm-kernel@lists.infradead.org; Wed, 08 Jul 2026 14:22:48 +0000 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-2cc80b585bfso6668865ad.0 for ; Wed, 08 Jul 2026 07:22:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783520555; x=1784125355; 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:content-type; bh=opfO1uNasWbxDk0QOATGHi4cTsmB3lXCvlDICGsJtuc=; b=TDEVrxpR2zIbRwQXqMCNVBJoml0M/7z2YBzX1SWJfdDpKvXNu1PDAsl2LrPiKtUdr5 pnEVT2Y+d5j0wtda8kUGzl74DSRtjmElGeRTKut+n/am5Oiv3CKD2Mono/4d6kS8gUky aHwDPk40fztFqWNNABvxd3tTO9irOFOIkFCmsx2C3WX+0tuMUkHNA9MCmGADzh+yoGYn K7c2JrCCvZp/wSKUxdM/15Ow7JL8sQNCJjMBd79f3NyDBsG7e8A/WtlzW3/l7dZX/QVv fkCeIC+HC4jiWRQlQBtQRWuguzA0ayQm1t/0MTB06XsyQLZE2MuV97cGCC6v5VY1odfD Sp9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783520555; x=1784125355; 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:content-type; bh=opfO1uNasWbxDk0QOATGHi4cTsmB3lXCvlDICGsJtuc=; b=S5Z/Nz8uyhBSq0vOdnnVNtdpkl85FkVhgn5zrovQfJlidZmEH1CD8k+sPl5o1q/fcV x9NvT/fXThL9gH7yk+z9686XM2LGEhDeqZn7UFf9uuhsTickERPrEGocV/bj3DQphefi Woe0uNL/S3WF9p9yG6vsP1I6Q7jYxD6+yZR2ONcXsMwxiOtMtpCgnpRE0Xkuh5hLKVZB RM/ELdAXO8DTBONkkK1o6McYqnttaymmqPcahhvhIovDjdN6XEvFPhikv9DbnLsQAKB0 XdjlIDV28DSwQzXVGM/+B0YXhmTzNnMlGjuX/YaKuwr7oL0kk4qtzYTfZfvzLFm+AEjg CRkA== X-Forwarded-Encrypted: i=1; AHgh+Rqel8EuJTGIpKxo+LIWTjS+mOBrlb2+ay30yo1CFlY/65g6mBsjnMmw2azTzM+MSmN/hy7cKyCxoFUKl4plseFQ@lists.infradead.org X-Gm-Message-State: AOJu0YwEzWvrDXPo3hPxgujvJmuc1T5hu0aF+K9B1+uiGpY2F1KcSfjm Wdboxyjd2Jy7KlDYxg/qPBH3vPgusNIB9yEY9Z+OU80TtSpox2VZPXLj X-Gm-Gg: AfdE7ckOIp0paNC30BPdGwUEqxNMKzLV0rvkJK4cM4K+Hil8rFSVmjBrHJWw43i4xKq mQ6wQfr936Yxh8zjrzn/AK7dBQZAzLcRkKTnnEdkMoEnsyUaI+Cttgs3RZKsByL1ijlFnYupDIb XXHd790uO1Uu0OXZchbZu7Sg5P7Bwk56Elie59RJ74YcpqDquiMpEvQPwok3usoL6qJBKGUHsRH xJiujiSUlDxkShE3IecvW5b8g/HlIRYzpZe5WvMORE+FD4UczubJ1TIFx64fdFHH4U66JbMBDab 1wCyY9FnQ6A1Yaimk6yXnk+oCi5uQ5rqImUTuymzizxjV0xxirF6WMo9QyFczTNw4Xm+Eg3bowk 3JXd4DhD4ezuz9ZK0yceicwDWoyDfYMvZlIX3SSa0B0x9HW5bWIVsZd4fTYLIatmUIFcEBba0oQ 14aMW6jretCrTiaPmZ1DB5JK361TNcvirsfadFaVPWs4WZLcg= X-Received: by 2002:a17:902:f68a:b0:2c9:fbde:ab66 with SMTP id d9443c01a7336-2ccea472721mr33400315ad.37.1783520555235; Wed, 08 Jul 2026 07:22:35 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d3bcc0sm28841575ad.67.2026.07.08.07.22.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 07:22:34 -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 v2 26/27] ASoC: codecs: rt721: Use guard() for mutex locks Date: Wed, 8 Jul 2026 21:17:33 +0700 Message-ID: <20260708141734.578926-27-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260708141734.578926-1-phucduc.bui@gmail.com> References: <20260708141734.578926-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-20260708_072236_056653_64923BCE X-CRM114-Status: GOOD ( 15.24 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=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/rt721-sdca-sdw.c | 29 ++++++++++++++++------------- sound/soc/codecs/rt721-sdca.c | 5 ++--- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/sound/soc/codecs/rt721-sdca-sdw.c b/sound/soc/codecs/rt721-sdca-sdw.c index 02df04a0ddad..f4f7fc306ea5 100644 --- a/sound/soc/codecs/rt721-sdca-sdw.c +++ b/sound/soc/codecs/rt721-sdca-sdw.c @@ -6,6 +6,7 @@ // // +#include #include #include #include @@ -467,13 +468,13 @@ static int rt721_sdca_dev_system_suspend(struct device *dev) * deferred work completes and before the parent disables * interrupts on the link */ - mutex_lock(&rt721_sdca->disable_irq_lock); - rt721_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(&rt721_sdca->disable_irq_lock); + scoped_guard(mutex, &rt721_sdca->disable_irq_lock) { + rt721_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 */ @@ -495,13 +496,15 @@ static int rt721_sdca_dev_resume(struct device *dev) return 0; if (!slave->unattach_request) { - mutex_lock(&rt721->disable_irq_lock); - if (rt721->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); - rt721->disable_irq = false; + scoped_guard(mutex, &rt721->disable_irq_lock) { + if (rt721->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); + rt721->disable_irq = false; + } } - mutex_unlock(&rt721->disable_irq_lock); } ret = sdw_slave_wait_for_init(slave, RT721_PROBE_TIMEOUT); diff --git a/sound/soc/codecs/rt721-sdca.c b/sound/soc/codecs/rt721-sdca.c index 35960c225224..159c35d19dba 100644 --- a/sound/soc/codecs/rt721-sdca.c +++ b/sound/soc/codecs/rt721-sdca.c @@ -5,7 +5,7 @@ // Copyright(c) 2024 Realtek Semiconductor Corp. // // - +#include #include #include #include @@ -289,7 +289,7 @@ static void rt721_sdca_jack_preset(struct rt721_sdca_priv *rt721) static void rt721_sdca_jack_init(struct rt721_sdca_priv *rt721) { - mutex_lock(&rt721->calibrate_mutex); + guard(mutex)(&rt721->calibrate_mutex); if (rt721->hs_jack) { sdw_write_no_pm(rt721->slave, SDW_SCP_SDCA_INTMASK1, SDW_SCP_SDCA_INTMASK_SDCA_0); @@ -309,7 +309,6 @@ static void rt721_sdca_jack_init(struct rt721_sdca_priv *rt721) rt_sdca_index_update_bits(rt721->mbq_regmap, RT721_HDA_SDCA_FLOAT, RT721_GE_REL_CTRL1, 0x4000, 0x4000); } - mutex_unlock(&rt721->calibrate_mutex); } static int rt721_sdca_set_jack_detect(struct snd_soc_component *component, -- 2.43.0