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 ED44AC4451C for ; Tue, 21 Jul 2026 10:30:19 +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=vJaZSLBuhqMtQ0nYByw0vZcUCn5hN3L2y+d0nH5sVcM=; b=pdJ2p37ZX1eAL+2cMbaf5cZ8p8 3nygbZeIOzJaYXPJr30u9Mufh8EWLrkEx3rLWrdOCaoS2ywwzb3PTjzp4wAqaGJqajCLtzTjFXQYB kXHlFJ1tiAW3isNJNVHDjXfks+0Zfipmp1Rm4msDe0FKNJuJKaHK9AYwZxImRa8AkxFcR1SGCJ3Qb XluGjEpQ8kddoLY5pIw02gI57Xr0QOS2Wbq5NZ+DJQbtbT1CA9aOYyiexvHeFqXZl62wdZez5arcV qAI2gB/8pPXjaBTfpTVMjpan0cOPhPZ2cq1MyI9hZb2Exj4AG4M45XyRZG6zqNuJZxDgbgTOLJHm8 lXHVEbTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wm7jv-00000009BP5-0fOO; Tue, 21 Jul 2026 10:30:19 +0000 Received: from mail-pl1-f179.google.com ([209.85.214.179]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wm7jn-00000009BIv-3UcA for linux-mediatek@lists.infradead.org; Tue, 21 Jul 2026 10:30:17 +0000 Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2cc7ef7ec27so119980455ad.1 for ; Tue, 21 Jul 2026 03:30:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784629811; x=1785234611; 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=vJaZSLBuhqMtQ0nYByw0vZcUCn5hN3L2y+d0nH5sVcM=; b=gA8Bo1R6uofKHd1BFB2tjWewyLi99L8ZcObTamn1HbVyGv5z2H6mibBYNXW8mfU1SM xn2mxckSaFFRr3fn4nJw8Cg2w9HJpDFi7qnSS8/ZjlneHfsJ50UpTuXt5ISpFpWS5sbx IARbS2Zos/1exqPuOdw0k5y/XqWcYtUwYwt7uzECnOL2QtJg4osXEU+DKCE5e1Ax4kb6 c+l5S8eMmBuS4BwE7lql9owoXDHq7stnlvw/MWvTpMaEWkf4S0zjUKvYD1kE+m/ofhDY iAoIyw8MQXVqZSdCDHf+P1kL4GLYt6Vtr1XgCb4Q/KOLo6FXLlquRA7uwiKzy9MM/o47 x1Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784629811; x=1785234611; 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=vJaZSLBuhqMtQ0nYByw0vZcUCn5hN3L2y+d0nH5sVcM=; b=RKG3asQh/rux+OpoDXWKFdi8lYytESEztiYdfkc6FRXQI3OCMOq268vOYPUaXxHoi8 vjqGPze/w9ser+O/VKePlaZkgEPAgHNObCtVGIDD3p6NaDJhOgHSxaP5nCKfE5d2wiRT +Og3AxRq9NqO+DTspuYQvWD6elqVyCVFebfD1c8RUnio06MRdm8HbcnyF7NLqibEbiy8 iK7H01aLcPjP/2rMkzvZqO6OLJzvZpXDbMEGkg2Ni4QOCAI9G1r2WXuA5Nlvxz6G2cE+ rArEYKiV36ODoNYvYTII1O+6FINQ4ZZw/CJrPtxB1Ve4S0QCtIkuvnvfi7lN0IveCCCk Oe4g== X-Forwarded-Encrypted: i=1; AHgh+RqN4gN2lAu24GriLLpvr3kSERr7hEhNi/4uPa4eqPZP3JCs8W/BbA5WYJcjO/0BEJvoycFKE8UllO+VvoDwpg==@lists.infradead.org X-Gm-Message-State: AOJu0YwYW1JdTdlInK1e0fK0ow/W1xiic9KWyl5HYHcCAitR+Lr24sFS jlB5KfQIB8K99vLhRenmrNCYuUQK3/VIYEvLlnEHgdWdC9+OKhemTw+Y X-Gm-Gg: AR+sD11lzZmwh0NbKo1RKZpHOWj51pDkCMnWxX/P74r9aRBvCZxLnqUkANWfLwAy5d4 W5FUf5R7oBvYO96/udnceFVcJVuXPl2GWEOocbzeXCoJ/VvxdxWRHMkBAvRRBafS9r+Hdo+pgLf a6Wx09igphbKKfzxIqrzhGXWwb5uTBEFXGTFSQ4X9OZeAtDFKeqGJt3FPIZCd4LVsJHvsh5ytMn 3WLCQj0A8gWt9bWIPOoUTxhuwpI98fsKKeSb82U4uoZAzd2owI8YmGtK0RxaY64BQBsKrfv9dp2 F2wmY/Dgxm5e2lPl4TtfJ9vtlkAW1LxPORRPepsX/lZhZi7OTH9LWzfi9XEw1xfDUr9qP63rXp0 EM5ZvP9wPJkFZghhi0LTZn43v8uX0d09JsCzqSdh6PyG6EnA0GWE8+XV4myya66EmfEg4y9cbJN Lx9x0yuoXNIAVWR0hWy6k2yOtxJLmdMLvjxueF X-Received: by 2002:a17:902:d2d2:b0:2ca:d7a0:1312 with SMTP id d9443c01a7336-2cf34961d82mr214608165ad.25.1784629810737; Tue, 21 Jul 2026 03:30:10 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf3448dac2sm73581365ad.3.2026.07.21.03.30.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 03:30:10 -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 v4 29/29] ASoC: codecs: rt722: Use guard() for mutex locks Date: Tue, 21 Jul 2026 17:26:00 +0700 Message-ID: <20260721102600.523199-30-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260721102600.523199-1-phucduc.bui@gmail.com> References: <20260721102600.523199-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-20260721_033011_910854_858A8291 X-CRM114-Status: GOOD ( 14.06 ) 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 | 29 ++++++++++++++++------------- sound/soc/codecs/rt722-sdca.c | 4 ++-- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/rt722-sdca-sdw.c b/sound/soc/codecs/rt722-sdca-sdw.c index d2db33b4f684..05e8e23f1f43 100644 --- a/sound/soc/codecs/rt722-sdca-sdw.c +++ b/sound/soc/codecs/rt722-sdca-sdw.c @@ -6,6 +6,7 @@ // // +#include #include #include #include @@ -513,13 +514,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 */ @@ -541,13 +542,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) { + 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..decf9407ab6d 100644 --- a/sound/soc/codecs/rt722-sdca.c +++ b/sound/soc/codecs/rt722-sdca.c @@ -6,6 +6,7 @@ // // +#include #include #include #include @@ -294,7 +295,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 +318,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