From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 2C0223EE1FC for ; Tue, 30 Jun 2026 06:38:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801545; cv=none; b=ccx5Kjr1dINekJfAkeUsmh8c+XnBX5ZQdjwX0sXJXpzQUhDJvl7zIYBSDRoAg9OGk2hqiBEmGCF1Y3AKU79OIt96y1hLhGcKAuriwYwRez+UPmxGqyf4SVwGkc8wTzQiU1rtpXnN0uYR+JSAnM377XGl2Vye0Bkfu+WDAsAuc4Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801545; c=relaxed/simple; bh=fBZDeHAFDZr0SJjeir1J7nLoUKn2MLHuB+Y6RtEoAU0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SZDNYbWw7NbR4sMxYrySb9Ja+8I2oD11AasqU3TYlBRmXSZjGmLaMiyAd+jA6kbikiDT02RMLOe3T/WKq62Yf9XhYavx8auuh6Kz1duBCTZwtx6TxmQERaBsKi56ykeRCTmCAIlkQf5YiE8jNgzIvIjsjelDKUPVpfZpWKr33VQ= 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=lZRVexRi; arc=none smtp.client-ip=209.85.210.169 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="lZRVexRi" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-845eb7b96feso1194896b3a.0 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=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=sA++AxO5NtmYTBb+M8Kemba0fl9Obtf3m3Dlj5iG+Uo=; b=lZRVexRiGaePb9c8zuOc5yFRhLCPFrxAu76rcniJi7RWVaJYGV77zNeC0uICg+EHgo mhMh+ybqkxFewLQMFPvm6FEPs8fl4OVwMO9NudWQ6bYsAf5O2vK7MDO2B6T5bfTREU2l SJO0npPzv8HmSQuF0AJf6GVeGqTXew91yS74NvkHJY2iitnTS7MehXD4Z1RMicBNtjKn xr0CJJhmn1I8A7oH/BehprobkAvdzpRdS6gf4peJkxqZSJuLfCdDkTSvUrXkyxW1LCbW wJs9THZ4okteNTgh+hCaP7yAlUx+hOXkxkOBMTJ9xWSAgSGsKkuPd9GEcW+3Qy2NtBXK 8jmw== 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=ZUkaUDl52M+5HP2mfsqbpuQBwtUAJLNla3XYMztyvdL3Ydb6EnD8bSEHFVozTERItF t3T0/bdVMFiL1O2CmAvRtwjCRAd5JttMzo1qG3m73fQsRK8HaiWL12bfgTgW/JOMmHr/ XDN2v/uo/MKjxy50s3jOC4AnCzY79xaAmgPQZXSflFc/mNPhkBC7xvUN31PaEB839pCy /NAa8CkPx/ubbUak7Qg4SdXLKv1VUSbyixEJzOcGoUMYURSHnm8Ef4C4QGBIXSOOJDFu /wswYp/dOamxW6ad+r3jIJuzu67kQnLK2++wsEBL1Uf/5UGxUwizaV7ej7x5GzNajC02 Bzng== X-Forwarded-Encrypted: i=1; AHgh+Rp991sfxEEIWETynbizu7IxkdsW69GsywujP6c2waIVw1YSZorIH7qghCjWuwoPGC4dV5VzdOXB9xeMk60=@vger.kernel.org X-Gm-Message-State: AOJu0YzOxr8bfLO0WUfDTxfmUNNQG0VO3pAisP36ktSOs2p65kXNRzWj 5+7StjX3WeygexAo0jsUCTWgOluL+1S8C+Sp0ddjaIgiSe1NQCgSGtRz X-Gm-Gg: AfdE7ckEhyPqEK5BE4wFYO6bYQrn7S6d254fBQIFwB1psup9Rilm8XwHTv1KqZs3Iqj zwkm9AAI/of79o97vYhJvPCvxtP4EoHq4wQucSG7VdQdw5AsbE4pqA0JjynqxT5X1iJLlwlDUgG IgLkjNnCVAAmflBLx3eXEomPg5n9/MOCqh2BhwpXY4M4o+yHoHw4bXSkeWf6yZqaejjnwKiKi8b pCv9o7XaGV6R+n5Zy3yAyLh3azQQ3IhXsF0QdQoJXMGWxEMl95sHSo6Q+mdudOS6QVMD/LdsSTK nFBTD5SxL+Fwhq556S3QRPqghcb184y1WYobJa9KZfwL5VFoc9d1hN55//ueIa85Oj15eDMqilg VdcES0Tr+zj3oNAv2+3bUWQ7Uz9ytAhdFpgU3bOo8t5J8nuD7VUdwi9NOgPkMxlML1mThLBelOh gsfVr+dfB/0MXXU/YgjHJpr7NJ7Vxo1zIMeKyuUsGsgE4D71w= 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> 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 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