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 30E82CD98E2 for ; Wed, 17 Jun 2026 10:41:02 +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=kxB3SnelSJeC61Cb2O2sZ2DxgfCvfhJf77FHm8odZMc=; b=SkFvIbqAN9yZX7vv+eTHlV/CW/ Xx9jWGET5kSKpq4TNn4UwNWvaI01AlM7gAiByqIgytuEdJQvjKJn60YolrTIu/3YeadKXXzzrmRaU kEuNUOKUHzI9xsYP3sItEJvmaRf4ytQeiTngGm+SzfL7lrWn6VggEWE7wOhq9Z16ho8aLgBCPSu9O XTrNoNH+QHQN9dPFWaYf0GJqfNgcw/SImqpPHG/TJLQFNlLmLQtWIahmL+2jPEu2d2MQM8r5TeoQq Wl3BZyOtNaY7+gQbblIjuqLWajHk585bIv0pAMJgona+Zmwyjqgi8zlcr9ZjES0dD/cMFTIlNybWh /EyjORHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZnhd-0000000H9lC-1Ska; Wed, 17 Jun 2026 10:41:01 +0000 Received: from mail-dy1-x1332.google.com ([2607:f8b0:4864:20::1332]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZnhZ-0000000H9iC-3N1a for linux-mediatek@lists.infradead.org; Wed, 17 Jun 2026 10:40:59 +0000 Received: by mail-dy1-x1332.google.com with SMTP id 5a478bee46e88-30bbe98c3f0so2732216eec.0 for ; Wed, 17 Jun 2026 03:40:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692857; x=1782297657; 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=kxB3SnelSJeC61Cb2O2sZ2DxgfCvfhJf77FHm8odZMc=; b=cX34vhuPO/mlD6RC+pBf+NDtr7nSFA7olErudnd5ZgC2MBK6FH/wa+6G3rP4RR8m2C mfXNW7LMUZsdbYd4Fpi2jj+8uBP5GhLtYq+ghemq4vKUOX0kO2mDNSNXu2P7iRdd2AYT DoPi0OgW759zaJJlVguiYv1AjozcOTzGxUCt0yMufXGPEoWDcGliWAPRZff318Dqx1Fx d40fKmb57A0oW2LcOC+XXa2p2vDeRhLwcl1HaNaxvItxrtCoNqZndBXrihSQOJoMfquJ Z4FdfgcUV1R0Y4lB1ezOnU+Aihkou1zMu3CNbg39q1+ZDn2BhkR8nvYOeliqXEd4cIT0 HP7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692857; x=1782297657; 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=kxB3SnelSJeC61Cb2O2sZ2DxgfCvfhJf77FHm8odZMc=; b=mdVLMdKLbd9NEdUC8JjbjUnEcK/gvlAyWDxO07B0iG+z0ytz/vzgnCYTDGN80YtXti Qxh2jV94gVGti2tHIYsxGUsOnUeyzLorHa5ygb8BghJ0QQoFHUMlNYkFxialXOeRhDxw BAfKaqq7UYofkdeyaM4ASQtFLbnmjooxJL2Idbjy/lyhruxQr0t6cxpwqrwWiy3FQfsA ARipJohMnNnesSZ1ldYEGZO3FeQJoy9EHFkQuwgC0keFM0hqjFGK3WsYBcqgK+hjjS1b zFAj7kCFQZMEpcj47iwuu2QoPuoneq1LJtHNt5FLPgzjes6mgJVB84UtunEML/SoNB0y yX7A== X-Forwarded-Encrypted: i=1; AFNElJ/PvWhn4Kidm91TfT+wUKyOuDaRkBGGrQ9M3zoPDiamXnnvBIh5Ul+J1i4Hct3tVGyXJtlS/Q3tQdl9KwXIcg==@lists.infradead.org X-Gm-Message-State: AOJu0Yz5n8smDd9jhAkuVo5jvrIz2pZB9qkym7Uhi9gPt16/I2CkaYx2 c7zuTdRre6Uvna9G9TZOzkr7zsk/1SEF4Qx+6rBz0YiZxz2IT7otqhdV X-Gm-Gg: AfdE7cnKdDo/caNhAA07nYCEKZkuv/cI+2L/Rfzp+2jrdxSWITZ1x2RKtBu2Os6yvxp 0tIgJDLZ4mnaZCZlfeETQKJdelqhfNRrjzkRAqek4ckF0pyLT0QBqqgC/kev9KJ41Kc+ozU9IyV EEHJx/wNPYBC8PsgDZpURV0t2Lp3z3efZW0So7FDZlZpvS1dJckPaQBgsRkQkfkJlGzZp0C9+q2 m6R5nTaldmJFASB5eP40aoquab3h7dPJXcU/lrGGygtg5XHWNrJV2lJk/Va1A0BKNj7MWjp/Cfy jYt1xNVMcvCwwIrkPBslXkKl26GuxVqYyzn1k6H25Kgqy0uYgg99k9gChJzcUGMzV9wNyQaiNe9 nRA0LL6P1DtQifVwv8GMq/ls++IOEjbrgVNe+ziZmU5xXXV0Y0pQ9VFP8SCFkg1OWoTMihzFCNx LLnibMRGLvhK/6w5lxCKK+7bieAagupcZadGEGv/fP6FYsLYA= X-Received: by 2002:a05:7301:10c5:b0:2e2:3381:2fba with SMTP id 5a478bee46e88-30bc9cad496mr1423566eec.3.1781692856764; Wed, 17 Jun 2026 03:40:56 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:40:56 -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 51/78] ASoC: codecs: rt722: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:32:08 +0700 Message-ID: <20260617103235.449609-52-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_034057_857216_43D8B5F4 X-CRM114-Status: GOOD ( 13.09 ) 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/rt722-sdca-sdw.c | 33 +++++++++++++++---------------- sound/soc/codecs/rt722-sdca.c | 3 +-- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/sound/soc/codecs/rt722-sdca-sdw.c b/sound/soc/codecs/rt722-sdca-sdw.c index 0f76492ff915..ca5a4ee6ce9e 100644 --- a/sound/soc/codecs/rt722-sdca-sdw.c +++ b/sound/soc/codecs/rt722-sdca-sdw.c @@ -368,7 +368,7 @@ static int rt722_sdca_interrupt_callback(struct sdw_slave *slave, * scheme. We do want however to prevent new workqueues from being scheduled if * the disable_irq flag was set during system suspend. */ - mutex_lock(&rt722->disable_irq_lock); + guard(mutex)(&rt722->disable_irq_lock); ret = sdw_read_no_pm(rt722->slave, SDW_SCP_SDCA_INT1); if (ret < 0) @@ -432,12 +432,9 @@ static int rt722_sdca_interrupt_callback(struct sdw_slave *slave, mod_delayed_work(system_power_efficient_wq, &rt722->jack_detect_work, msecs_to_jiffies(280)); - mutex_unlock(&rt722->disable_irq_lock); - return 0; io_error: - mutex_unlock(&rt722->disable_irq_lock); pr_err_ratelimited("IO error in %s, ret %d\n", __func__, ret); return ret; } @@ -514,13 +511,13 @@ static int rt722_sdca_dev_system_suspend(struct device *dev) * deferred work completes and before the parent disables * interrupts on the link */ - mutex_lock(&rt722_sdca->disable_irq_lock); - rt722_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(&rt722_sdca->disable_irq_lock); + scoped_guard(mutex, &rt722_sdca->disable_irq_lock) { + rt722_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 */ @@ -542,13 +539,15 @@ static int rt722_sdca_dev_resume(struct device *dev) return 0; if (!slave->unattach_request) { - mutex_lock(&rt722->disable_irq_lock); - if (rt722->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); - rt722->disable_irq = false; + scoped_guard(mutex, &rt722->disable_irq_lock) { + if (rt722->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); + rt722->disable_irq = false; + } } - mutex_unlock(&rt722->disable_irq_lock); } ret = sdw_slave_wait_for_init(slave, RT722_PROBE_TIMEOUT); diff --git a/sound/soc/codecs/rt722-sdca.c b/sound/soc/codecs/rt722-sdca.c index 1b6729f363fc..5fb5dc2ee3b4 100644 --- a/sound/soc/codecs/rt722-sdca.c +++ b/sound/soc/codecs/rt722-sdca.c @@ -294,7 +294,7 @@ static void rt722_sdca_btn_check_handler(struct work_struct *work) static void rt722_sdca_jack_init(struct rt722_sdca_priv *rt722) { - mutex_lock(&rt722->calibrate_mutex); + guard(mutex)(&rt722->calibrate_mutex); if (rt722->hs_jack) { /* set SCP_SDCA_IntMask1[0]=1 */ sdw_write_no_pm(rt722->slave, SDW_SCP_SDCA_INTMASK1, @@ -317,7 +317,6 @@ static void rt722_sdca_jack_init(struct rt722_sdca_priv *rt722) rt722_sdca_index_update_bits(rt722, RT722_VENDOR_HDA_CTL, RT722_GE_RELATED_CTL2, 0x4000, 0x4000); } - mutex_unlock(&rt722->calibrate_mutex); } static int rt722_sdca_set_jack_detect(struct snd_soc_component *component, -- 2.43.0