From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 30CFA3783DE for ; Fri, 10 Jul 2026 05:08:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783660135; cv=none; b=cjr8uwhJTqj7tQ+Hl9L2WY6ourSVWSisBStZPl3wr/QYWbv1+ZHlWE1cC2yt2EqE7MKdSECHjg0pZEcDtHbb9LVUkZYV+VhLTWdpHa+oLOr4Tl4g6z08iBTwFI4wJ08UPrBwkuXpJBDxceF0CYhgSShqpQgqFER42K7eEskH+ZQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783660135; c=relaxed/simple; bh=4l47nKOfFrpcLKwvsMkxuD6ryRZ/IuK5tCYTAO4zVh8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jI3GAPDJEve6IrmN9ZHOr/HZGxDS0yZT2hp5K95Jhjp1crGtovwykXT5wRZWrf7RPFj9OFLPsEc2dItjBU4VyYCGioyQh2Xd+gzOMiGSSXrllyjorsYqRDqzeaiR6uOXfTM1DTAE/3ga3B8HUZrn64mwsXfYcBUxf1nJqYltJyY= 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=he6aQEHO; arc=none smtp.client-ip=209.85.210.180 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="he6aQEHO" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-8454160043aso452190b3a.3 for ; Thu, 09 Jul 2026 22:08:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783660133; x=1784264933; 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:content-type; bh=/iQDQsc59ksOHtvDkgxoCvh5YAWSsI1newC+9ZPwxzo=; b=he6aQEHOUrruYGQRXKgLuiLDlWdSM1rHQWvU3ULJoCzh3wZH/X6nsbdhTUd2Q7RK1S lFj9yKoiczL80uYAvjpykdzuyY66a8mo5CM02vFqN1HrtmJbOx7KhlUETiamToXhtRdc y3UF+vNKgxnVyk3oYtQADNEUjE5P4JWSFLo5CRUlyUmUr7bdziSx14L69hswUSKb8LfU 2uAY6HqDaQBBb+ASDraijUxk/an6Bn/du1cnLS9VEBu94C6z7gH4LibV2OPAyaqS8XVJ 2G8Jq2bYLVuNjTXWtkAcvpccR/FiVSXKFwgWPtxHJv5ieDVjWrqEPy9jpcwklLEUEVBe xEDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783660133; x=1784264933; 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=/iQDQsc59ksOHtvDkgxoCvh5YAWSsI1newC+9ZPwxzo=; b=onxEhBFkNbm+zl8szWaXi/sGJTAVJXjUQ7Chfw3kqz64ibx9RMzliCbBhFtjidG9dH Un5ZerLam08jNgkTjzD5aZDqj6gW6ok1hET3zpr0fEQJpO1DDwSm+uD85VgA8vwxEV7l fsp468p1EgCh/HNWtVMyffg9dLJ2PL0uB9yd59iZ1PLOstM2O38Qcs4xnIZF4U2tvvIh KbRtKrSQaywujijMSXf3qXRB1VyEiU9WVGjNqscu+6j3+Gi7MezVrLgCatfFQP4gBOij l5+MzK6zXklaGkXMnbBz5Pv8NkCh3W9Xp0HjesWfINm+4HVD/Hd38KkXiDwIH2gNNYoZ j5dw== X-Forwarded-Encrypted: i=1; AHgh+Rr/YumhtES9+nCU3nAmgyEvyTF4fTX+JcSi/PEZ4vZe39ELfPHH+gRQcAGXkP2xmfgJrwsF9fYHQp9vH3Y=@vger.kernel.org X-Gm-Message-State: AOJu0YystDS+p/XqcZeP2SP1bnvzTT2aHXzgMSM6uW1lSuRSvMjSme4N 9+N+4AfPQwZPuTkYK4M8sqtLuiqwxq8N+qe80KITKEinTPobvyp51GdC X-Gm-Gg: AfdE7cl2SUhWwyYeNlAoPR7965DYBpwvTzn6V4/CcC/wapYLhDSfkvyTwxk7+6ARu6O m2XTwdPTRZd5L7yWnOlD6X9OxApHZ+akj6fCOebqZh6M/mmeISUh/ZYJ3idUIgnb+bXqsy0XiY4 fXRh3s/+4UXGwFCnk/f6SDpy0yAQ2fKetWi5NHhaek8XZ2XBJInoKxXyQ/HGVeZlCxMUsIk9+Dy +M+fwRIJqEEQmCZ+KGqkXqroUUIM0P9kCykCpK56LcKiT98LpdqhnTSAxhCqmvq67emSthxfnjn zJWa98DXc9Kv5lt591hKFepKmZqCbv3BSIEXSW0hIqlt5WW2RMSP2Av2HGIFxw+Rg1nGDabSLOt GL7fC5HrSOvWD3FRun3OQ+LbFcEqPUZ8+8RchGX+QwGxFEMV+O/2SzGtLswuw0ZxbflE1W/FTGt yY1iL4wCTIGlzI4PBp4h1dYa2Nv6g11NM5BFVSXf80ZftXCJ4= X-Received: by 2002:a05:6a00:bd0d:b0:848:6698:2d5a with SMTP id d2e1a72fcca58-848669830bfmr3555077b3a.20.1783660133566; Thu, 09 Jul 2026 22:08:53 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84847275fa0sm3400499b3a.22.2026.07.09.22.08.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 22:08:53 -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 v3 27/27] ASoC: codecs: rt722: Use guard() for mutex locks Date: Fri, 10 Jul 2026 12:05:11 +0700 Message-ID: <20260710050511.14439-25-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260710050511.14439-1-phucduc.bui@gmail.com> References: <20260709045902.498848-1-phucduc.bui@gmail.com> <20260710050511.14439-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 | 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 e68aa0350a5b..db1aeea2ecb3 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