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 ABD70C43458 for ; Tue, 30 Jun 2026 06:39:06 +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=sA++AxO5NtmYTBb+M8Kemba0fl9Obtf3m3Dlj5iG+Uo=; b=Az9IActD0GjNYgfRA0QvFWQflv 7vLx61znRVBcFwyLDY17cmSKnbdn51J4vXXLLJ3ZQabRDWlpqsWdBHbJ8N9usoYINwgfRuaTvNhmX TQ6bsRVuALx4PA+rvmE2/3E33+ODKQr95tIe3TgClauLV36gkrMVG/nb8uuQ/ritB+zZT5wjOE4a9 QjPpHCv9XMPUofe07Aiphn/ACjRZCOjgGBWyXihFNLRRtSgfZwxY0BnbRQR96t/AUAEX3wKrnLtdv b8LpjJe0NUc6sCO/TqAclqmK8JvAo08DPmWwM5an9B7bEBznatXowqGCtDdSBtD7GXwcJc2TYLts/ nd60XGIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1weS7Y-0000000G0s1-1aRg; Tue, 30 Jun 2026 06:39:00 +0000 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1weS7T-0000000G0oH-3tbh for linux-arm-kernel@lists.infradead.org; Tue, 30 Jun 2026 06:38:57 +0000 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-84236f9b638so1782267b3a.2 for ; Mon, 29 Jun 2026 23:38:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801535; x=1783406335; 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=sA++AxO5NtmYTBb+M8Kemba0fl9Obtf3m3Dlj5iG+Uo=; b=qKQKOyp/vq02DUy2NUwNRIb52rZZ+/Cnj3gCgHBZl6NcRYmvKeuVG/sMAzA3+LhFfE 1HJ3iP08rDBPhNHigBIdfVsFm3Wyu0nlDPf+syspWAHHteu0Kd0R5nx3NtbMKmpf3lcX zAJwdEf0/fUPD+16qorasXw+rJb2LwMq1SiulxKGhTuUzmjNnOMcNOnvrhkjJW5Uvtlv mwWV6WkTNit/OjNwNSgXr8zJ4ZT69GT6jXEMdX+VpbEH1nzPCnpQmPDldFtnQo7NyAVz kXNcY5rOgugGgVZao5YllGHYh9ryTIL1jo0pATS90hXR0uhOstedvYloVBVFbn6kyEQw vU2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801535; x=1783406335; 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=sA++AxO5NtmYTBb+M8Kemba0fl9Obtf3m3Dlj5iG+Uo=; b=oV6Tq5YU+LNiN00BY8xzDyuLIGYLopEkVhOJRZou/xbS2bOUcAZCe+ol2Tdehl7XNo luG+0GMlQAHz6oFZWvGCpHEPtafyyUC0anNKnuAwhOfsnaThMywIS2uXsGnDhbXlYyNC P983uwnLdhA6k79VpiQ+jEtO8oIne/mi0Ne5+aNLeAszConk8lfLrCcwEYIespWiGYP/ HjJXd0lDxlsSjcHjl1RJ/eX8ZjUqncp9EMOliFLLUusyXp7WTMhJkrp0+Zk9hRkzwy+J Z7D1G4c6V2HmLQS5CWTqS9P6rNqBydbCijvuwE+c4ho8OEIusy3EBA1qb83fM01Cfz3D kosA== X-Forwarded-Encrypted: i=1; AHgh+Ro6NXkzvOYthp3f9wBqIWP8Ho9V5wPKTMBjrDAGW1To8EyexFrYwetwgEGo8xVqf336Nw6nk7QIheI5YX/phkfc@lists.infradead.org X-Gm-Message-State: AOJu0YyGK0iWzTvYwjsAvQ6WWbWSPAfwnmn/yGvOq74jLKp4aXROXg55 HZb+u1Z2vvN5oUgPw3pR0JG+YnpMmDB4Kk2WGsCRwdmFk4Pimwx5dT07 X-Gm-Gg: AfdE7cmZobUTQOEpAn6rxZugrMS4l5oWJT0urYsng1UsohS2QwSKty3m9gIb7n9IRUo aWD4A3Ow7ZsJY/ryYPoysrMPQBv3EgD36CGRdw/bbFT+0cDxEtWPYAheVo2hy/Dr9OxT3PGadhS JJfMamKH169pEddSk20FtDfi3bISCcdIsmvt725f2nrpYpTnao9EvtisebagYLL9B+FgNJG6b6Z xgaT1jJy+0Q0FYodzCHPzNwJm8cePK7Kcq7mWMFupWEhC46UDfm1sRFtyxl84SP3uyZTCinKrxm Z2mU+B4ImRWlduli9rLLPxlzsu2z8h8B+CsL4HSj0cbu75u9tJzpRsJpsifdaGvxQkbadwSM9v7 Oc/8JgFgZdEUcgkLVvLm3Oq5J29rETM0uZ8oGcz+MrE/EQumtjWNko4LTkwK8avjzBniY+bjPk9 0WCDD4s82R0fkKnH+Tjo6oy21iRIgVfrkV558Ne+7CFtz3JI8= X-Received: by 2002:a05:6a00:1797:b0:847:711f:49ab with SMTP id d2e1a72fcca58-8479f137897mr2189312b3a.22.1782801535253; Mon, 29 Jun 2026 23:38:55 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:38:55 -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 27/27] ASoC: codecs: rt722: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:49 +0700 Message-ID: <20260630063449.503996-28-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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260629_233855_982823_305C4131 X-CRM114-Status: GOOD ( 15.17 ) 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/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 284900933ebf..895b8b2ed607 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 @@ -514,13 +515,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 +543,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