From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f179.google.com (mail-dy1-f179.google.com [74.125.82.179]) (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 C917D4071D9 for ; Wed, 17 Jun 2026 10:40:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692860; cv=none; b=MJgG2GyS0oonqeJ6H+5x1pEpol3N8UR3PnhzhmUjImPX5iDS+qQfd7lokG59nACRPyBBwH4lL/H1363rHzuMME2okMBmGWc1500xLAc04lrOclAYOAmbLbtBBN1F2r1kgNOLEYO/mhWKJoYuckvfmPkSI0O1sDQzJLEsPSizHwI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692860; c=relaxed/simple; bh=QkG7uMhxFhIgdfzJMdnxdGkaLUEDO6tHpYig6hGOA/I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FlQJw5sLmSjHF+PQOOYzw3r6Gu4oj11oRtY/ZhFySF7CweFieTyBHnX2MTYusc6OOttQtiDyRN+pnyedWfWb0i5Jvr9TJwO15RVAyP80iAP3fVVwQljrczhiw1Ran1ccBZ6XmUdD3yQe9qrVtPI3Z4aWPQaQHABk/I24dwUbPxY= 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=MJzQgBPB; arc=none smtp.client-ip=74.125.82.179 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="MJzQgBPB" Received: by mail-dy1-f179.google.com with SMTP id 5a478bee46e88-30bbe98c3f0so2732206eec.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=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=kxB3SnelSJeC61Cb2O2sZ2DxgfCvfhJf77FHm8odZMc=; b=MJzQgBPBt2rwZXJjiBNEWBVl/FO9EPxRhpM9n5Ar2hXf1nnB4logthggFDDUpIoqQI 1/dpahilPP7Ut8oSHrLqP/ZmwwxnYHqd+vxJmtfmMvu2ftuA/LkyP/hflyzz19H76aAJ ayexVvU3f9y7ZAsfWbrCAFRT6s5IfkOhUZI2DGlcKhz1lPMUMgkgy5ipGNs1zE8yrPug y/gKD82K4WNNMQ4ghV91VGyjCilqKCoi3xVUJb6RGly9WnkG6qW3jTf4s1TCQns86gOm JnlGcsqJQBEItFdzi5OQfx2dn3dl67geUfY3eB+ZwNkxMYRJ9w2uLBZF4WmFGC+Nk4uO TW4g== 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=plBaIYvPpo88uLfu3dqqro0pRD02hRdAPZ6H00pXh1TAe+asBCsy3/DVcxPR8lr9Rv 3EpDANFWc0kCo+Iziqpo0qMAaOZCt4Wy0nSG81kx9yrONueLmUXVyoHlUBU/aaRrn+Ao bpWrRDoQM3c2PV0yHUUBxAuZ0Z0eCBIu+qGjeIIQvIYz4743o14598+/Ciq3kGPkVW8I tE7ZWjwS5URS3pya32sxMDUlcKevWXnp+iTdE7chXqqa/QSvwzzrwEIWF2JwcXrDfiK+ QNRKX3kRNsUITAyBZSXcdGvSBf0HCmO6/HEE7NxnAxvk01D+TxesQxak1YMH3JR1zImu 6Ovw== X-Forwarded-Encrypted: i=1; AFNElJ/TjeMmrTo/43gmMOOVB8O6PEJolNT/VQCj4XQBheAzf4R7A88d2sXmGltAWVvyjYDs0qrQEtXstrZUYFo=@vger.kernel.org X-Gm-Message-State: AOJu0Ywk3sEWZjkJ3y2KwaPIFdb3O/7DRUqksiksDYBg4HPlk14NKfcJ 18RYHRyIIbABOqIqsHRGNNS6IBdRJHV6Id7eDhJfTb95PDnKUGeJBmCb X-Gm-Gg: AfdE7ckAsZMLeg1iUO95slXkRP8AqbPCvlaccmLR3COevA9SV1vGjVVhBozj08I+xcM FnVY5n/r0/JyRzkvm4jp2dpKHwU8RsO1v2I+8gsAQ47QkNM5SiHQaMfkj6KUQmGIkGQJXVgnWgT XxQhkjBBBlS/+3ykV/rU5KU2Fl5xQ86LsHdlO1TDMV1CzkL/UwDRB4U2hmtemvAL/F7OC6cNURx J+57szMIwzKXjthpguJMcjmXREImliaQvQh7edZK/RHaZ4u7Dj29x6OEAaRDCPs4q5+7jK7rMeW JXlwej889TY2w5Qq2dIjiwGsfq3YAjlZhYnJCkdlwGH2xJhiv2ST1y18vZngT/MnNHCigAVFIqB Vv0e0DIg0kLJ3BqtJmFpys0eC7VgA/pEacVJlDY+dSmgXr7ef+zP4cexqk6ZpITkHn+lkFhYX0x a/AN9bcGdi1SnRBGEqeltgiqxwiwyIQ+gus4h9T/GmxrwpiIE= 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> 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/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