From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.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 C4BB136D9EB for ; Tue, 21 Jul 2026 10:30:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784629813; cv=none; b=o7gRqMah1fvcsbYbVDEBsTHlqh8Q4hjwFRAMGKEA/eAatO44Ll795L6TK4iaA+UFfCwYeETN6owUZmlsCQi2dLOmVNPI39LpUxdHonQd/NUzuGiEO7P7kSe9QZyT4M7NTEN/l6+MYLuZfgrSXDi06ee4jdLVwZMWXlh/52FfL/A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784629813; c=relaxed/simple; bh=8ttlR+tB/Ek6pHfAOa7qh57d/TkjEVyyP5L7gkm3RIo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DCtwvl9L1lmxluzKgv6F3vzmgyVAbBRVu58pBaJw5iU0tHygGfJvKfs71kuX9vA7HkCNfXnb4dqzoHl6ralet6IKhAnx/jLe+Y+R6MEnpYNu2hcw5LzquwMu5IRY5/ljNUEinxUxE8ivMmKdRhNRiemn+oj8F48ErMhF0S+vvSE= 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=E6G9KBOv; arc=none smtp.client-ip=209.85.214.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="E6G9KBOv" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2caf228a910so87758545ad.2 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=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=vJaZSLBuhqMtQ0nYByw0vZcUCn5hN3L2y+d0nH5sVcM=; b=E6G9KBOvTL+Y/SBzAy6mWqlBjo/OqIJV0ZFQIFzoW1UwkKSkbZO8v8Wrn7EPD6HfDO UTBX48KirQu/W7YqOt/C0FSya+xnEwLMtqLrVn8sgh4PUoC/tavjjuVBaaiUv22QSqx/ ny6ubp2kf64zXIg/1yZmy67W5Q9LljKwHkArlrcFNeOx5RlNesxTnmIqzh6WwDbEyy1d 8FhCA9HzG9lSR6rDl3AK0vZc50YRt8hAF0RGw0WMymY0mRS11cHgeN+qaNqFHAlQXXXn oTtBjVVuyFQWdlUypZXfY3pL6GIj9T53YbR3VHwtFvO6BimLGixokauW4kOEfO+dxYav qunA== 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=o/Pyz6Zp+LE2aB1iC7EFFeODima2dlqQ87ac4cI63RCPGDZ3+LopV0aY0gQec01WaP w3FpiuB/tRx0INLD51o4/UHNpipg55WMNLSS7FiZA5npmigVmj+7LiiL6PFaVMuhffZl UgEwWIlxOk7ASjm44OavtXqrPu7jUqiAZiuAeWIHl65EnR8yvKL+QQDJkxfTlwSQySbQ wqhLFT4Cl5HbdI3iYXyC8kb8mBpzIreym2NDiqadA7YrSLlHATXp7vivAZvYO3zdKLSz AjFc3Snn8kRV+UiEGHLiuvcBw2f3lUaD/a8qRuO8vXZXPRUEIPmPB6yl7I/JzPTZxUsl CiJw== X-Forwarded-Encrypted: i=1; AHgh+RocaMDrR5nJXPaCH9034SEggJHJi+HZ8FOEVHT8VX6W2ODcSBn4jLsJrG2BVUqb5WikUKqQzDQYK0WWucU=@vger.kernel.org X-Gm-Message-State: AOJu0YxDXoQnr5H/FOr9EE8CYjQBH6EWe0BBITlxC1kcvtjqryFB7umg CxeEfloXzmm3lI+BWpZay+D/5e1es9yiEWt8gtxOxXW0rcfAajIpXG1N X-Gm-Gg: AR+sD119dlXkRc1iKq5Adzjqmpyu4FfzAhhlM+X8/34YNKXeJM1jF8H6C1+XCwAhVAR er9nSoJ2wJ8Y7TgB3981bl5K87kNHmkFxt98PAaDQiVmQLysq0DxpKgFQm32r/D4eHWrAJQLp7z 98kfj7WlSAg7N1sXN+6HIbAxmXwbZDjGTx+brfUyDdXTWPwa4gCJCUz9wJMzvA2M+UMW3fG0g9Z cRX6AdhIkXxLXHfdqFglxUfX154K1X0/ZWINsWBQAm4UjlMat4s3+b1yGsDBe70bMiHwgaKzCVh 5vQxOHjhnHSFA0/rvAe3ygl4Crr3Hs6YO07622wICDFO8+aEd8P5m/RjjkCjRwAyX7A3Fh2Er8U gbNC2uzYKCPKQpZ+t+M7VK07kX8qCA8iUX+XhydjDwQ9Mv/Nr28eA5Qzxae4xWUmEsG98aIUf7N 4ws7ofpmRm7mIijT+uqOwcxX7zUu0MERNWofF5 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> 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 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