From nobody Sat Jun 13 09:16:06 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 98EA83D0905 for ; Fri, 8 May 2026 10:39:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778236741; cv=none; b=UaWvIf+KTBpPSOkMjpSDWKM/Oradc2uAdbAKIjgJNUCcXl5KmOMio90bOir6XWNkjryDvr0dP4iQdlc6oIyCsokINY5kTkw8Li4/CcbpcdMdiJdm8HOuYjYr2+lXLkjaZjRItofNkXxT1FNY6mAjPMcIUhquUehHbN38/YdA3B4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778236741; c=relaxed/simple; bh=HbNQyIOQfmtYFfsohHgbl06rBm8HI5vxHjV4u7D/pL0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dy0jaE3hiA+pahihHOx6lhFs5WcmJ/C1YewcIl0Qa5n9e2HbQkLZXRl+l9IdG6wYkZknIafvvI1IURTrVnypCA/yWNlLC6AbpLlI5ojp2jl81Jctv2q/PoJjpP2eCgs4Q8u1bp39+vZw36Kl+x1jZem8C8iEdKK7uG57PIp52N0= 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=lSm2BeKT; arc=none smtp.client-ip=209.85.214.181 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="lSm2BeKT" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2ba21d32776so13177745ad.2 for ; Fri, 08 May 2026 03:39:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778236740; x=1778841540; 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=+PHyrKnEx3Qw34k80dXVEjulQeqN21vdCRBwPpUnfZM=; b=lSm2BeKT660yA44NPx2nyf9g5J5GJHqFaeqswpB/sEFyZ8N2YEHpVxCChnytMoGX8O Ewl5Ax9OmaQ7SvJqooq6IrCy6C7sp48KjuWwPDJvh6pRNN5z02PXL09R4uvayu3sKOTt FbfqxTpyBZBZLnlTo++wbzbCtkW4iLGFf/O98sI5GEesb86opO+lpF66hCFevsApkdm+ e06URc/XVDLPE4IVIcmu7pa2YOMWMDsPxCd7s2Do5QZyamx4JI6QBfARjINTJBluuAZq iJUAky4HaDwHEWhT4nDQhryTVmssZ7IXie0v7GkKds1QVQUCk9WyoNbmAeOaBdJ/lreV HO+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778236740; x=1778841540; 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=+PHyrKnEx3Qw34k80dXVEjulQeqN21vdCRBwPpUnfZM=; b=ogZX9BoqPpcyuwOF6dSzQSDrbfPZlXUJQniYHZVKqiKlsVO2MtnOeQWmFMOt8E8Eru YC9DVu7Ok4UcOmGJhiMwlaW16D8NO6atdIjmjxGbPKRflWFYQwf9U3Ad74JHmtOb34mX OpMsgybLG14iboJsvxWGz5ub2QB7Spd1uZSx4MGmVFD9eYy1JiSUaTzPW4abUx5OfRlI vfKKxFPRtTtq64v7aEy9SBgX4e3MrZ1PW5RGiM5StDJQvctFDaeeF5Fxr7u4hi4eiS1b LiE/BJv51wSuTbbOQgWk/c1f0Khq4lBtNgjmwH4r311aH1Yaag7bCBl0Fnt01WELdUSf j+8Q== X-Forwarded-Encrypted: i=1; AFNElJ8YCPLbdTnxnkfGx6zJL5QJcXjuZDgULo89g+T0rxO7lw2JxJms/1doQd8lovvTcG1KXQj4TBJsqGF1kzw=@vger.kernel.org X-Gm-Message-State: AOJu0YxszXxcSL0ulL57jxWZ3LGAqWBx/rBC7Nftcm8XsrpDo3JGBywB 8Y73Mr4wnQY946+UhCZYnfUamQJck2/Qwrs/c6wxWrenDEj6bVtC6FDy X-Gm-Gg: Acq92OF3ThKecBt5AKw2Kn3NieBVNGT/ht6UW4SGav4mUQFSTADVmT/5tuu55cAActl BptITsLFad3XTDS61LHWzi4sDw6K39NKbhcdA1CqKw9C/CB+WMI4BTOGoPcN8wE+LBFv8IHekEy YTUrX+KDj3R139q4URubtcgIVOOlKZKV5GejjdYnGJd76Z7LZOIZXUdT27o2T2Bn8HdjzjeD00O mKkdn48FzJBxcW2fxlfjEwF38w7kB5JV1lXhsWXYTlwj2vchTKO465hNRgFcyYmv2GpKEtXLfC/ KOnoMBNJucBwCnIqlViwdi6auhXmapGKE+xGziao36lgDqRMdiygTsnb0Q4HgnWLIScBgpatTp7 2vPa3Fv7hL67nFPBxfXxZk3/zewZs8XS9dp7xfj4r3xxz9U01Sfrv970bwZWB0hO2DDGm3ga2KY lmjxl8A9rG85Tb+69zX6l62y5NkPgWusINrR14MMpADsxH4Jsdtz3fNlKLJQ== X-Received: by 2002:a17:903:1ae6:b0:2b9:edbc:69f3 with SMTP id d9443c01a7336-2ba78b4bcdfmr118316335ad.9.1778236739848; Fri, 08 May 2026 03:38:59 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1d27109sm18309345ad.1.2026.05.08.03.38.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 03:38:59 -0700 (PDT) From: phucduc.bui@gmail.com To: peter.ujfalusi@gmail.com, broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, jarkko.nikula@bitmer.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, bui duc phuc Subject: [PATCH 1/7] ASoC: ti: j721e-evm: Use guard() for mutex locks Date: Fri, 8 May 2026 17:38:31 +0700 Message-ID: <20260508103837.138142-2-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260508103837.138142-1-phucduc.bui@gmail.com> References: <20260508103837.138142-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Acked-by: Jarkko Nikula --- sound/soc/ti/j721e-evm.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/sound/soc/ti/j721e-evm.c b/sound/soc/ti/j721e-evm.c index faa62c1a9b8e..8a3333aa32ee 100644 --- a/sound/soc/ti/j721e-evm.c +++ b/sound/soc/ti/j721e-evm.c @@ -263,7 +263,7 @@ static int j721e_audio_startup(struct snd_pcm_substream= *substream) int ret =3D 0; int i; =20 - mutex_lock(&priv->mutex); + guard(mutex)(&priv->mutex); =20 domain->active++; =20 @@ -303,7 +303,6 @@ static int j721e_audio_startup(struct snd_pcm_substream= *substream) out: if (ret) domain->active--; - mutex_unlock(&priv->mutex); =20 return ret; } @@ -323,30 +322,28 @@ static int j721e_audio_hw_params(struct snd_pcm_subst= ream *substream, int ret; int i; =20 - mutex_lock(&priv->mutex); + guard(mutex)(&priv->mutex); =20 - if (domain->rate && domain->rate !=3D params_rate(params)) { - ret =3D -EINVAL; - goto out; - } + if (domain->rate && domain->rate !=3D params_rate(params)) + return -EINVAL; =20 if (params_width(params) =3D=3D 16) slot_width =3D 16; =20 ret =3D snd_soc_dai_set_tdm_slot(cpu_dai, 0x3, 0x3, 2, slot_width); if (ret && ret !=3D -ENOTSUPP) - goto out; + return ret; =20 for_each_rtd_codec_dais(rtd, i, codec_dai) { ret =3D snd_soc_dai_set_tdm_slot(codec_dai, 0x3, 0x3, 2, slot_width); if (ret && ret !=3D -ENOTSUPP) - goto out; + return ret; } =20 ret =3D j721e_configure_refclk(priv, domain_id, params_rate(params)); if (ret) - goto out; + return ret; =20 sysclk_rate =3D priv->hsdiv_rates[domain->parent_clk_id]; for_each_rtd_codec_dais(rtd, i, codec_dai) { @@ -356,7 +353,7 @@ static int j721e_audio_hw_params(struct snd_pcm_substre= am *substream, dev_err(priv->dev, "codec set_sysclk failed for %u Hz\n", sysclk_rate); - goto out; + return ret; } } =20 @@ -371,8 +368,6 @@ static int j721e_audio_hw_params(struct snd_pcm_substre= am *substream, ret =3D 0; } =20 -out: - mutex_unlock(&priv->mutex); return ret; } =20 @@ -383,15 +378,13 @@ static void j721e_audio_shutdown(struct snd_pcm_subst= ream *substream) unsigned int domain_id =3D rtd->dai_link->id; struct j721e_audio_domain *domain =3D &priv->audio_domains[domain_id]; =20 - mutex_lock(&priv->mutex); + guard(mutex)(&priv->mutex); =20 domain->active--; if (!domain->active) { domain->rate =3D 0; domain->active_link =3D 0; } - - mutex_unlock(&priv->mutex); } =20 static const struct snd_soc_ops j721e_audio_ops =3D { --=20 2.43.0 From nobody Sat Jun 13 09:16:06 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 E70A13D1703 for ; Fri, 8 May 2026 10:39:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778236749; cv=none; b=t/qajrIE3Nf9QtRctcW6+LDBtIx0YRStopyG5pVQvCRXopaG6OXfwYVwdYWaeOcvTCf8//KruCn+IPGlO/7VQY2EcBldQtEViD1JkKGno7sSyEJniEFsudY80UX/yFAjwr9Dq9Vsl8MfHP714wMmI6gX5XdQTvXTxOBYgM5RjQ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778236749; c=relaxed/simple; bh=+Cat/hrzlP9TQa7q7VLyIEo3Rx45NIuQaGGmUTbrMPU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LhPbUHJYmMtF75OjiA7rfw1ZwRTcyIuyHjdocjhfaMGWk/QDUE9JQtO3I9A7UAarJpvVoOGgjwPJAiKiq0dS+7nXf25AVciukfZ3d/se6ILtKanSvpsZ+46nObw14XWNgaEJv4DBzEH8fmR1LrI42i9YGMSlAhy/ZcrDHdHbYwA= 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=IFtEicd6; arc=none smtp.client-ip=209.85.216.53 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="IFtEicd6" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-36643b96b99so736115a91.0 for ; Fri, 08 May 2026 03:39:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778236746; x=1778841546; 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=N1fF2g2fGUgug/smobxh1GYiC42PEqoDgJD4+eh4r10=; b=IFtEicd64JDkJNoYlJd6jHifz3oo6kVZqVS16EvYhL5af1t8Dmv4e32Gz8m/+I9Ewu eJTsJ9fEdBVqTPppqgUKQFM+l7yHk+2OQZwn7GpNPQLX3dKODCpNLQnPjgReVOtHZ9W9 sGKfUS7eInuPJMuNVijeb3XDfksgc3tGDTk/V0sCa2Dli8+Crl/hrvrw5PU6fL5rM4ti kZyRKBjd7DTYgxM0ndfgTy+WIi2pXSQMgVdQf3gjhYWHcJWmJgMqutA3onmfptZRFLd1 mNKDnnY7z7Vxvt1IbML51QNazfME5GAh3qfk2TrH1z7eSEQ9IyFayJXWV0WV+54s9DnF OSPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778236746; x=1778841546; 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=N1fF2g2fGUgug/smobxh1GYiC42PEqoDgJD4+eh4r10=; b=WkVydeGBXUTgtqAiyvptewVozFaxnnn3TVcXq6Sy3LO+XVhdwgg9Uyzjns/mnB4FSh 46GvHEQS4dNqNrAB3BXJu8E5cxeSvtMzgNOBdR15qm6rob1triLLUfIV7bVkq2jchxL5 pzsVI7NJ5LHBcbYxnaQb7pPsR19vFcZp8BbSTYHxL5PulWmxyoahCSdBFBUlM1/+qYBi vuV+SS/ifmThjqgLHEw6WoTFYu9r0hevn68NTThehPlQEDl1TFZsp3nEsUPFVMydEwPL kZ81I7q9hpX23nYMU+weyaKzsbnoamd+p4AXQP8dtncE+ttdfDwC09pEoLBhMRuNXBs4 N3fA== X-Forwarded-Encrypted: i=1; AFNElJ+shUZURb2WK2ha21MDVzjqZTfzCeYRR+uV/OwGa8y+mnXk5RBpthHbII9s6pl5is393ohT57uMPfJD/4k=@vger.kernel.org X-Gm-Message-State: AOJu0Yy+ioioTvOOuJilXtXZuyI9MlUAnmCd7/rR/K5wtFSueOurLnHS kciZLEz2F7AdQi5ewvXxDnVKwicxjBNMNdnx014V2uezCtrji0t/Xg45 X-Gm-Gg: Acq92OEsI98hdhWhexYCCQv+S5qXKCxjRt9wAwGW4SZnnmqf6nlpVGtbUqn0bwAjQ00 giy1MR8K8816DaSJR1mu0u5nbesftPM7QM9Q+8e6M+xb2RjFK7mruNsD4LSiTnwFlDSflz3H4Qx AdwoQTV7c5GQCzi/StvDpZjvSM1aebpWCZO1Dw4ncuN8fb2P5xZ3XV/TQqcUbNrqoKDtO361ieW MyQ7g5GaYg0/RIg53PiupTILfeXMqENS4sFk+UBTo4qGmuWbJPs0pYpzVgN/4QfAISlumH54LQ2 ms/Xs4hBmNemUFUhG3L4Y+jwYBh5K4r6fCkC2a6+gQMQwF3kcAnxNSOXQ4wpiq0Ju+1xlx3HfOI uNa0ru5p1AnM0DK65c5FF4jwlI19Fnx/SJ5hDPtNK6HJslCM8UfbunbhqX9u7TW9PC2cTFa9sBe wYeAAbAIbp5uSHSceEtt3Kl/7RVA8PHe98+iKtIKHsT83vspSFcLAQVLu6Og== X-Received: by 2002:a17:903:1b50:b0:2b2:42da:25c4 with SMTP id d9443c01a7336-2ba794bf96emr121392205ad.14.1778236746201; Fri, 08 May 2026 03:39:06 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1d27109sm18309345ad.1.2026.05.08.03.39.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 03:39:05 -0700 (PDT) From: phucduc.bui@gmail.com To: peter.ujfalusi@gmail.com, broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, jarkko.nikula@bitmer.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, bui duc phuc Subject: [PATCH 2/7] ASoC: ti: omap-dmic: Use guard() for mutex locks Date: Fri, 8 May 2026 17:38:32 +0700 Message-ID: <20260508103837.138142-3-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260508103837.138142-1-phucduc.bui@gmail.com> References: <20260508103837.138142-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: quoted-printable Content-Type: text/plain; charset="utf-8" From: bui duc phuc Replace open-coded mutex_lock()/mutex_unlock() pairs with guard(mutex)() and scoped_guard() helpers. This also simplifies the control flow by removing temporary return variables and unnecessary goto-based cleanup paths. No functional change intended. Signed-off-by: bui duc phuc Acked-by: Jarkko Nikula --- sound/soc/ti/omap-dmic.c | 44 ++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/sound/soc/ti/omap-dmic.c b/sound/soc/ti/omap-dmic.c index fb92bb88eb5c..dc92fdb89a0f 100644 --- a/sound/soc/ti/omap-dmic.c +++ b/sound/soc/ti/omap-dmic.c @@ -91,18 +91,14 @@ static int omap_dmic_dai_startup(struct snd_pcm_substre= am *substream, struct snd_soc_dai *dai) { struct omap_dmic *dmic =3D snd_soc_dai_get_drvdata(dai); - int ret =3D 0; - - mutex_lock(&dmic->mutex); =20 - if (!snd_soc_dai_active(dai)) - dmic->active =3D 1; - else - ret =3D -EBUSY; + guard(mutex)(&dmic->mutex); =20 - mutex_unlock(&dmic->mutex); + if (snd_soc_dai_active(dai)) + return -EBUSY; =20 - return ret; + dmic->active =3D 1; + return 0; } =20 static void omap_dmic_dai_shutdown(struct snd_pcm_substream *substream, @@ -110,14 +106,12 @@ static void omap_dmic_dai_shutdown(struct snd_pcm_sub= stream *substream, { struct omap_dmic *dmic =3D snd_soc_dai_get_drvdata(dai); =20 - mutex_lock(&dmic->mutex); + guard(mutex)(&dmic->mutex); =20 cpu_latency_qos_remove_request(&dmic->pm_qos_req); =20 if (!snd_soc_dai_active(dai)) dmic->active =3D 0; - - mutex_unlock(&dmic->mutex); } =20 static int omap_dmic_select_divider(struct omap_dmic *dmic, int sample_rat= e) @@ -334,26 +328,24 @@ static int omap_dmic_select_fclk(struct omap_dmic *dm= ic, int clk_id, return -ENODEV; } =20 - mutex_lock(&dmic->mutex); - if (dmic->active) { - /* disable clock while reparenting */ - pm_runtime_put_sync(dmic->dev); - ret =3D clk_set_parent(mux, parent_clk); - pm_runtime_get_sync(dmic->dev); - } else { - ret =3D clk_set_parent(mux, parent_clk); + scoped_guard(mutex, &dmic->mutex) { + if (dmic->active) { + /* disable clock while reparenting */ + pm_runtime_put_sync(dmic->dev); + ret =3D clk_set_parent(mux, parent_clk); + pm_runtime_get_sync(dmic->dev); + } else { + ret =3D clk_set_parent(mux, parent_clk); + } } - mutex_unlock(&dmic->mutex); =20 if (ret < 0) { dev_err(dmic->dev, "re-parent failed\n"); - goto err_busy; + } else { + dmic->sysclk =3D clk_id; + dmic->fclk_freq =3D freq; } =20 - dmic->sysclk =3D clk_id; - dmic->fclk_freq =3D freq; - -err_busy: clk_put(mux); clk_put(parent_clk); =20 --=20 2.43.0 From nobody Sat Jun 13 09:16:06 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 B860E330B0B for ; Fri, 8 May 2026 10:39:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778236752; cv=none; b=O/gEm1xqlvnR3ArRXk4hkSuQwJe5SE/mN2JaDdx4hg4DXZdqk0i2pMZnkV5revmb09jjExm/ENIxsufcSPEUBAfd05Gt31IJCGdmp3QewYJHp3Yz4slpsHn3kMLhYtx9dh1h7UdMTbVrROhwBW/XeuHIj6pwOoQNagaeU9eZsnE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778236752; c=relaxed/simple; bh=IDfulofV8L3pjBAwtb/03nHXAYUcs5a20eJyXfotbwk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XyljfyfEizATOBpfPZ7NPLEz9l63XI/BzDorzPrq7OAb3ik+YajxIXbnFlUN/Rutxm8I9/Blqw6jERvuFB8zKFHdve8AI6FVahnnQOMRxlEt/Th1l3tB1xngym6e5zmbS/P1WTqEv04Hqt2QfJcb9q7UMitL1PdcBGofcEH/YcA= 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=HADUq02j; arc=none smtp.client-ip=209.85.214.176 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="HADUq02j" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2babfd18435so9431555ad.1 for ; Fri, 08 May 2026 03:39:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778236751; x=1778841551; 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=4zKyR5U1yAXuf2WaMek/cM/qR7vazFRcQvHEtxImguA=; b=HADUq02jxeyeOIveZd7w7EYwT6G1v3nrgHsV69x8oSiWWp3JiVtiokQQFF7jGH4HfN HLVTdYpn4UJ6nVoyXCPxG0FRcKyZRu76H6/xx23OV0Lm5WsoJbVrF5adVXji7UprChJK isi3VqYUkJePRvHkG9kznDKJWJQwKSC5I2P/COoy2EB3yTJOT4krTWM8zDLsGR9hkJWY C20HB3EPnKyDvLMaYLYhLE36BevGpLS+OabokUsgoen81CIeVPLof0cw99aLsradV/Vs 4yw6cir6cPBP/CHbiyUpcBawdQ8eZ7lt8segjYnT9NtLDgI9NuXeWI5F9PYH+WTrDw6p 2xIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778236751; x=1778841551; 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=4zKyR5U1yAXuf2WaMek/cM/qR7vazFRcQvHEtxImguA=; b=eGppiKJipjFUI4N/GgO7NZZW1RucN4LPCk7PLT3+aFJoGORy4dlDHioG1m/PAvLjR0 QoP2GflJI6tSsoYpJt/kMs28aeCev+QqSEDeZNIKG7Vx5iMYkdx6OkSQpoaRLyi6Vgy7 CPPr6N8j+/2zRNKfM245cSGkVj/kDeHar+vlMOPxn57r6xvFOnSjX2KB9fT3EiZTJWfv qo+NkuSsNiQH8Ifi/GgbTXVLc1QVsiFJwaCHJNElM1vinm1pOF5p/zKNi/qOweF0yBiC oES5HQShXt0xCE3irrt0VjCdpP4O+pL1nScDan/XpflN1hXicZW9YEstIaCQ3hhZ9y5b 3u3Q== X-Forwarded-Encrypted: i=1; AFNElJ9qjDUOnDazZ/XaCTxcBYdVusWkkNlEUHSS2xBhV4lUnraI323nzWdtN3yFuN2s1pIeJYHxuX6MmYs9K68=@vger.kernel.org X-Gm-Message-State: AOJu0YxWiqDIhI6W5QUfb9+uoaQ0SKICgZce9auxYZgigqBJd3yZKXTB 6PAyK7Uni8vJpYMwOAEa49YqmlsZ3tBugeGYM9+37jtQKThbz91H/E7U X-Gm-Gg: Acq92OF+1lAoP0N0XnC3/U1oxihu0pM9UceLY0/qtkcT+baUFIr4+R6rcoZSHeG2I3k CBPJ+lWhFg7dfrWX/+ra5rLkBmHMM6c8KnH99LDYPw4kk4bFDRwlK29Z0m88ffiscX8XYD5Yv1N R4mTtSpptJPcXiE+NAobQ/swcjcnmAe+phtwGLxzybWRKDmj2YDeHNwepVY+RJsOdllob9XcPCy QEzTcaejcFXcXxCYtm6bEKFxMvUQNG39JHyyDiU3LC/n/pYHMJmvKpDhnY0k/BtNmXHEFKlJxXI E681eiyv9AzPklrZvL22xLAtX67sGtVj9urT9UCYpYHTlyFna89+CV9V77LjzodwBS189+UAKZc vrIToCR2W61SUadiHTCxnZRPYvAcBLJkHLdnBTYvgQYAzlKBNGM8I90tRtIqSRV9T4Ij+9xfmkV JKa/+gzYILHHKzYDjbiJAYTut0TYHUudtWnZ6DTOgmH7ApfEvNQlDp/v+1FQ== X-Received: by 2002:a17:902:e98e:b0:2b4:5e65:5d0e with SMTP id d9443c01a7336-2ba78c40260mr94019615ad.10.1778236750894; Fri, 08 May 2026 03:39:10 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1d27109sm18309345ad.1.2026.05.08.03.39.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 03:39:10 -0700 (PDT) From: phucduc.bui@gmail.com To: peter.ujfalusi@gmail.com, broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, jarkko.nikula@bitmer.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, bui duc phuc Subject: [PATCH 3/7] ASoC: ti: omap-hdmi: Use guard() for mutex locks Date: Fri, 8 May 2026 17:38:33 +0700 Message-ID: <20260508103837.138142-4-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260508103837.138142-1-phucduc.bui@gmail.com> References: <20260508103837.138142-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Acked-by: Jarkko Nikula --- sound/soc/ti/omap-hdmi.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/sound/soc/ti/omap-hdmi.c b/sound/soc/ti/omap-hdmi.c index 55e7cb96858f..e60f5b483fc5 100644 --- a/sound/soc/ti/omap-hdmi.c +++ b/sound/soc/ti/omap-hdmi.c @@ -49,7 +49,7 @@ static void hdmi_dai_abort(struct device *dev) { struct hdmi_audio_data *ad =3D dev_get_drvdata(dev); =20 - mutex_lock(&ad->current_stream_lock); + guard(mutex)(&ad->current_stream_lock); if (ad->current_stream && ad->current_stream->runtime && snd_pcm_running(ad->current_stream)) { dev_err(dev, "HDMI display disabled, aborting playback\n"); @@ -57,7 +57,6 @@ static void hdmi_dai_abort(struct device *dev) snd_pcm_stop(ad->current_stream, SNDRV_PCM_STATE_DISCONNECTED); snd_pcm_stream_unlock_irq(ad->current_stream); } - mutex_unlock(&ad->current_stream_lock); } =20 static int hdmi_dai_startup(struct snd_pcm_substream *substream, @@ -86,16 +85,14 @@ static int hdmi_dai_startup(struct snd_pcm_substream *s= ubstream, =20 snd_soc_dai_set_dma_data(dai, substream, &ad->dma_data); =20 - mutex_lock(&ad->current_stream_lock); - ad->current_stream =3D substream; - mutex_unlock(&ad->current_stream_lock); + scoped_guard(mutex, &ad->current_stream_lock) + ad->current_stream =3D substream; =20 ret =3D ad->ops->audio_startup(ad->dssdev, hdmi_dai_abort); =20 if (ret) { - mutex_lock(&ad->current_stream_lock); - ad->current_stream =3D NULL; - mutex_unlock(&ad->current_stream_lock); + scoped_guard(mutex, &ad->current_stream_lock) + ad->current_stream =3D NULL; } =20 return ret; @@ -261,9 +258,8 @@ static void hdmi_dai_shutdown(struct snd_pcm_substream = *substream, =20 ad->ops->audio_shutdown(ad->dssdev); =20 - mutex_lock(&ad->current_stream_lock); - ad->current_stream =3D NULL; - mutex_unlock(&ad->current_stream_lock); + scoped_guard(mutex, &ad->current_stream_lock) + ad->current_stream =3D NULL; } =20 static const struct snd_soc_dai_ops hdmi_dai_ops =3D { --=20 2.43.0 From nobody Sat Jun 13 09:16:06 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 78B0A3D2FFD for ; Fri, 8 May 2026 10:39:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778236756; cv=none; b=MU2a846I8zDVH3MLgXYZTxq04TbNdWe2gQdjqQxOuMiM2xjTkViSOPa3zWCuVPgg1NQ9gA+SZWXPWh70Vv6AgKUXu+s8KfLQXHkIWCI9k9ErPB6YroWz+h5/W/QyETZGA/K1lwslTKsr6Z8tCDNBf/MqJ0WC5OkyWP0wDZmA/+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778236756; c=relaxed/simple; bh=28cWvZt5+LjVRFYTpiBD7lWC/PI7kpR5cnKEpuPnDeQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TGEJ3Rc747juM0mRWofa2vDL+hA/GsEuInh543zPbkMQsZfJtcm9/Xc/GHR6iDtsez/gi6SIDv437pO0ywtq3ttN35cvLiSqBwLOfW6Z2s6XaoAbOXInT5y5c9zXx19PS38AGgvkUxNaa3w5G+HFDcNFrWMob711tVgkk52VKPY= 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=V19QTynV; arc=none smtp.client-ip=209.85.214.181 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="V19QTynV" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2b4650d5f5cso6929735ad.0 for ; Fri, 08 May 2026 03:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778236755; x=1778841555; 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=VtY4fEpkcKI43PjOB3u+OACOnE6yg3XP27IxAIRobhU=; b=V19QTynVeUXGSbFe+O7PxceLr/8yFzhRaI9E/+g/caoKcIUP9syDHEtl1jAsqu37v4 R0hYO8et/WL/u/bfW9XLXLfbVPPMO2hOSN3QeYuGD+enOf6sbTVmcEYXmfgPj9x9XRgI 96ei9MzmnkZ2zbT/XMGYVxQwfT8D26bEZFiWYNFPPgZ41yPwfqM5dxRd41O4ijUFuZ2y TvCNKf3znkCW38BJn0DYWD8CTroWH8EjdB3AbLeb3voXC9wr27kLNJzDQUEzLKCKkdW3 aY4xg1lRr1AiMK6rVAv5OFiNZU6JoPthiZ7jJGuXOXzrSXaCmSkm5/TseviWSNthVj8U 1jPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778236755; x=1778841555; 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=VtY4fEpkcKI43PjOB3u+OACOnE6yg3XP27IxAIRobhU=; b=XwET1ZgrH6GWx3cz83WR3+8rbvVrWPwMDcrgjRolj9d5yKbT0vhvG14Bz1eM/Hw/c1 iBQhaw2Z/8+jbaeF/KmbbXRwPOWM4OwSPQoXR3W0Ngrj36GfskvHjRjOD+xZJgFimnEc 4Ik0j4/hSU6cv/+YdWqslmhUjfDIE5jeiG7Y2YE+6+M4VAaK/z01dqoUGn77DpnC5EIm ZuyEiGo8Np06ncISfOS1T3d6EMUe3cV0kvSTlIcCGUh8gUzOpo3Rk5c+RKTU2dbQ991k 7CRIKydoZsU13bf/2+gKaomf0vwx58B1ZW1X7XfJAVN4pYXIYk/3mR8/l4JowokWM5Rd GElw== X-Forwarded-Encrypted: i=1; AFNElJ/cM6LKB7lcmqv8bnTpsGCo4v5VUoSgTArXv9xew8Ukc2gV7lS9/s4YiXwvN2+Yv5qAeuQSRtWNcSSg6Oo=@vger.kernel.org X-Gm-Message-State: AOJu0YzSeYFPvLU6TqqOOwxn+sBBGxZ8YwpCspzIdy2x6thZfqYrdEU6 6R7K32BNIkcuCtnGqRpObVYrIqY9EC+iF76PyAWu9kxRMz+f5thTnhK6 X-Gm-Gg: Acq92OF6nFE8MBPPhzGg+YswrFPPq+95vXE2FFSX9WadW7+ayccM+JKSHDBauFLeWBi V57HO/zBI2HK5qcn3RRqm+oomj3Es6hrmqAZmPKwrs/KHeMG/ERFrJrm7IhzKcV+KhWN4kkCpX5 IIlVtyMVAi66dyMGgxb7TXhMfH6VAQ2/p/zattQtuC1ZoO0TBYx+IEXicoeOrcf6eYg89DLg+TS ha6Etw9YpY021MbHqswTctgKMXqvGsyARVED7RQkrzRN2VLbD5vwqQ5iZuQl/9mdE4V7WrrXgqi 87u54Hvm6CGBsWxu7INeBILhtm+8jcwEzX76Bx0EsinVjge4XoAoEDXgEtyhlGGtXlxR5xIyUkn Gs/VImTIrblcvQ15gn74u6CofX+zniIZpLWPUzXWxSvzGXZAM/9M2644C8X+l48f71VXfbeaIYs Qmucry30M2aqzBxouZ7KtAmMquani2ZCgyccsxz26RPwONuNEQHpAHd2wpFMRBpviQRhPV X-Received: by 2002:a17:903:2ecb:b0:2ba:2581:36bd with SMTP id d9443c01a7336-2ba798c26f5mr125067205ad.21.1778236754856; Fri, 08 May 2026 03:39:14 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1d27109sm18309345ad.1.2026.05.08.03.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 03:39:14 -0700 (PDT) From: phucduc.bui@gmail.com To: peter.ujfalusi@gmail.com, broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, jarkko.nikula@bitmer.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, bui duc phuc Subject: [PATCH 4/7] ASoC: ti: omap-mcpdm: Use guard() for mutex locks Date: Fri, 8 May 2026 17:38:34 +0700 Message-ID: <20260508103837.138142-5-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260508103837.138142-1-phucduc.bui@gmail.com> References: <20260508103837.138142-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Acked-by: Jarkko Nikula --- sound/soc/ti/omap-mcpdm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/soc/ti/omap-mcpdm.c b/sound/soc/ti/omap-mcpdm.c index 1a5d19937c64..c7d7b502f120 100644 --- a/sound/soc/ti/omap-mcpdm.c +++ b/sound/soc/ti/omap-mcpdm.c @@ -251,13 +251,11 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_subs= tream *substream, { struct omap_mcpdm *mcpdm =3D snd_soc_dai_get_drvdata(dai); =20 - mutex_lock(&mcpdm->mutex); + guard(mutex)(&mcpdm->mutex); =20 if (!snd_soc_dai_active(dai)) omap_mcpdm_open_streams(mcpdm); =20 - mutex_unlock(&mcpdm->mutex); - return 0; } =20 @@ -269,7 +267,7 @@ static void omap_mcpdm_dai_shutdown(struct snd_pcm_subs= tream *substream, int stream1 =3D tx ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE; int stream2 =3D tx ? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK; =20 - mutex_lock(&mcpdm->mutex); + guard(mutex)(&mcpdm->mutex); =20 if (!snd_soc_dai_active(dai)) { if (omap_mcpdm_active(mcpdm)) { @@ -287,8 +285,6 @@ static void omap_mcpdm_dai_shutdown(struct snd_pcm_subs= tream *substream, cpu_latency_qos_remove_request(&mcpdm->pm_qos_req); =20 mcpdm->latency[stream1] =3D 0; - - mutex_unlock(&mcpdm->mutex); } =20 static int omap_mcpdm_dai_hw_params(struct snd_pcm_substream *substream, --=20 2.43.0 From nobody Sat Jun 13 09:16:06 2026 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (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 88FB2330B0B for ; Fri, 8 May 2026 10:39:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778236761; cv=none; b=scomBe12FkFZsuhx3YtHFKUow+An7JsIfsDsofHS+d5Gcf2MMSIgEJ3J5Xv2vUG5Zwo3+0Qv0n2i9Su2Y7zFrpdWN/hGX5GhKtim+CQX6LhLxtf6bu8RywuPBkwnWjyxe8bUxi9RI/pRxgn/MJc5ihWv9NWm7/9TrO5ealRcydo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778236761; c=relaxed/simple; bh=hgD0CGh4ly4OvpPUJGHRau/Dkr3Aayaonu/8yfXXpu0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DSXhT4dPnlPime5+5UdxW6d9YcY6A7Pq+6Y3JsK2KMHI9m12o5Yjl5rPuB+W146tEsIPiiv8CpYNBuDrgYsKx7OTJVQ7H4rudGulKo+S+pRYHLakyfFyTcB/Ba+dfx+aPifbGTfaUF5UGglQVGN7uJRhx9vp88TBFBKHMsa1tAs= 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=FUn7Xotu; arc=none smtp.client-ip=209.85.215.172 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="FUn7Xotu" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-c80227c9572so800666a12.2 for ; Fri, 08 May 2026 03:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778236759; x=1778841559; 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=lLQoiR5rrh3hqy6OvnSB4BV7IM1W5VVe7Onht99maeg=; b=FUn7XotuHqFNnpQ9zw0pzeSC83ZT3HShmDlCmAxYj9GRlpB9iqhYD0BvIjv0eO7i0X XNt9rz/yBdcijOTmjsZz8oX41xRcHQVwbmu+c8LT/KWUPZVa7eo5arxo2TBqEKxAT92H NScPQ0OmpP7G2MOGQCa6eeVbh7c1u9xWMcy4PXfPhAD5/JxGqmpEtLpiCaFFnCol+KyU qumjrUbtZO5bXkD5CQSYLvFq/f3RBX/GoeP47wO5LR8zA4i2fbgWSfUGhRTxu1kQVv02 Pal5CW0NPB2cyWsQg8YK45mzd8QDqaT2f/+YXqXrnz54otA/L7sC/J2aezs1cbIpPAFt 3zaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778236759; x=1778841559; 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=lLQoiR5rrh3hqy6OvnSB4BV7IM1W5VVe7Onht99maeg=; b=qz7rWd/VcLhyokXuvhhjL7+eoWB1pJX4vsRUz8qW/Fhw3ZGvGybRz57Jhl3yq8Rern PkSw2iWde/PH1XkczseIrNFv1DLnM3SSgS+KDDLGceU6zidCLaKLfPzmjBuScKpj08GL XhI12t/Fg9Wfp2h23l1kd+9IDSzL1xbYUk0asNvt6MlTtS0h/k72o+Ng6H5jKysTgbtM /GHJ+oE0DJxIyDCJh5wS3D6iMl5j+NhTzavX0MdULx2uWF2L+dfBHAHNN+1/AlGb6Ppl mIwsDn64TtxgQfvvnAmsV2YtIWqo1yd6SR8e/cUV7R7l1lJPl/sXokAB2zDFPLxIZKdy fBBQ== X-Forwarded-Encrypted: i=1; AFNElJ8oORkJWfIHoqLWA+uD25bzKo/nzxoS8gQDYKunVX120nJDRxFQwZFUfaflWSBxCHgdsIu/9WGtxDCPg0g=@vger.kernel.org X-Gm-Message-State: AOJu0YxANIDtryUPYoHbJR3KdsY9kR922iB+h6jIqpFo5/NHj39WZayh F3t5fEgSC2KisV9/xrdoJAI3NNbNQAbMrxjs8fftysrFTaqbewmrF7AJ X-Gm-Gg: Acq92OHip+u0QqtuTyYTlkT0q3mCGPz2pLtUHyBHqgKv0SRfhc9N8h2oed0qCoSO0Gc xAECMKpc67ToqQVmpMICmiqgvPKKfvvEeR0020n9Po1AX+DO+txAwYFBcUwkxP+mCMa/1+HvFal hOA+3kjFeid2TH/qdhXeCY3wn9rnsxG+EF2qujbcSzQjo8oUF+xhIcRydp+4VGGME21UqxxBiqZ 6CVXBuFOx9dRwpcKB1sYoUCwCXCR1/u8eGfozzTjLZBd1+CsPxm9URIM+bXb/kuznXhGtE91ax6 AvD9/eZ94Mv97HojHLn/VIQr1KU4eGtZuvvkZ3ls9qsYhmvE8QUfAPvMELLbXL4kSZGsbMgMiri oVYUQWT9LjFeRyzneOsEO5C1BXmGW5qaSzmJc7W4McaqUEY9rTPq3dRKqZgq1KXb5pa5EWV9L16 1AY36G/Jz8lKQGe9+qhjyhTEQX1Q58ZpeIXwXhKkLFww2tJUyOVGP1gWMJ2LuZfjqNRfLRuOeoi 8Rs1rM= X-Received: by 2002:a17:903:1d2:b0:2b0:663f:6b53 with SMTP id d9443c01a7336-2ba7908bfb1mr124730905ad.13.1778236758762; Fri, 08 May 2026 03:39:18 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1d27109sm18309345ad.1.2026.05.08.03.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 03:39:18 -0700 (PDT) From: phucduc.bui@gmail.com To: peter.ujfalusi@gmail.com, broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, jarkko.nikula@bitmer.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, bui duc phuc Subject: [PATCH 5/7] ASoC: ti: ams-delta: Use guard() for spin locks Date: Fri, 8 May 2026 17:38:35 +0700 Message-ID: <20260508103837.138142-6-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260508103837.138142-1-phucduc.bui@gmail.com> References: <20260508103837.138142-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: quoted-printable Content-Type: text/plain; charset="utf-8" From: bui duc phuc Clean up the code using guard() for spin locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc Acked-by: Jarkko Nikula --- sound/soc/ti/ams-delta.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sound/soc/ti/ams-delta.c b/sound/soc/ti/ams-delta.c index ba173d9fcba9..6dd0d051a757 100644 --- a/sound/soc/ti/ams-delta.c +++ b/sound/soc/ti/ams-delta.c @@ -264,10 +264,10 @@ static void cx81801_timeout(struct timer_list *unused) { int muted; =20 - spin_lock(&ams_delta_lock); - cx81801_cmd_pending =3D 0; - muted =3D ams_delta_muted; - spin_unlock(&ams_delta_lock); + scoped_guard(spinlock, &ams_delta_lock) { + cx81801_cmd_pending =3D 0; + muted =3D ams_delta_muted; + } =20 /* Reconnect the codec DAI back from the modem to the CPU DAI * only if digital mute still off */ @@ -373,11 +373,11 @@ static void cx81801_receive(struct tty_struct *tty, c= onst u8 *cp, const u8 *fp, continue; /* Complete modem response received, apply config to codec */ =20 - spin_lock_bh(&ams_delta_lock); - mod_timer(&cx81801_timer, jiffies + msecs_to_jiffies(150)); - apply =3D !ams_delta_muted && !cx81801_cmd_pending; - cx81801_cmd_pending =3D 1; - spin_unlock_bh(&ams_delta_lock); + scoped_guard(spinlock_bh, &ams_delta_lock) { + mod_timer(&cx81801_timer, jiffies + msecs_to_jiffies(150)); + apply =3D !ams_delta_muted && !cx81801_cmd_pending; + cx81801_cmd_pending =3D 1; + } =20 /* Apply config pulse by connecting the codec to the modem * if not already done */ @@ -426,10 +426,10 @@ static int ams_delta_mute(struct snd_soc_dai *dai, in= t mute, int direction) if (ams_delta_muted =3D=3D mute) return 0; =20 - spin_lock_bh(&ams_delta_lock); - ams_delta_muted =3D mute; - apply =3D !cx81801_cmd_pending; - spin_unlock_bh(&ams_delta_lock); + scoped_guard(spinlock_bh, &ams_delta_lock) { + ams_delta_muted =3D mute; + apply =3D !cx81801_cmd_pending; + } =20 if (apply) gpiod_set_value(gpiod_modem_codec, !!mute); --=20 2.43.0 From nobody Sat Jun 13 09:16:06 2026 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) (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 898DC3D1712 for ; Fri, 8 May 2026 10:39:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778236764; cv=none; b=LrMAbGrlsBukhhJRExXNzjqnsy0XUA+i7GIcIdHeREk6BzFnztdlLMy7YNehqwGb2N52GXOWNqRRTUETIGkGO8tHwUxM4rgK0DMls3n9wIB5lwmZDnCAG0mCffVvQQpuZPP1g9eU9QAeYPRgnS4G/PXKBWLHY95BshrpHo7N7yE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778236764; c=relaxed/simple; bh=X8FuvP/99gyNUMmHvPuFXmMMvK2n28I6GDJoLygfXIc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G/2rcDfGFpp1QZKeHpebJouzl/RmnrlCxk3su54FJ43gixW5Cf97W0PDigxDMhperA3raSFllw3tx1tYncuUhL+noonGkrBbR1pXSEJGX1F4+CwTWQOAwdHJ04Wo5cjjX1EjBcfAtqOew8oNciXeLxW5GQU1dmkNTlKGTIDCQMw= 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=rLu3fxGn; arc=none smtp.client-ip=209.85.215.170 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="rLu3fxGn" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-c801912c903so799464a12.0 for ; Fri, 08 May 2026 03:39:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778236763; x=1778841563; 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=M7TyisERyCLhAIeiN1+m/zKrVKHagMvjPp9LlZU4W08=; b=rLu3fxGn+Fj+3HwvzCP3KAd1YotEsTpF9GtKQ3KXKw0L3GN8yBXti4vZPtfGxqW4Gj 87pWMyjruW9LAObvvJDhTqTmb55sdZg+aM80YvLGdCD4ANm1M/IMu6N/gaRriiQIwmib 5j2pH2oE3IqqXDngueuPKceQOhkNkI9FuqDinaYByQ8rEmkgiIZLXUUcEAaMLGHhyU2Y Jg7mdsPzFNxe9ssgYWqz55yeE5r5ITdkqqQmXZSj0AAxLgUBGT99vE5euoqg4NqNzccz 0aYSs9MJ5VuJrKxMAVMI062/zMjbX4yJWZbp6N5ZCVG+7eiTvOFuhuhrkmsHywD/6GwD BOLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778236763; x=1778841563; 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=M7TyisERyCLhAIeiN1+m/zKrVKHagMvjPp9LlZU4W08=; b=lq3DoGF8dK5O+2N52RDDhhod3HRgDzM91qkGSsKPKZLzyI/IszzJ1ovdBr+wUvbzWI w43MSxIpqCYUFbEVQz9zXO+vokSqpbJXdsF0OThPtxVcJOs+Ed7poTUGnqb8pMBz494A q/zJRb82Po8XkzielyyREva40VnpZBAJw8Lcnu42GZkbsjJc6ARQM19xw/zrfrnnj245 +IC8rct+1vIBJS9fRnogR+ERmyxAaIHrihuDm9ls7qFwfUwg2e/ryaxH1hFRW7rZcjE0 GyLhbcvShmSBWtXfjDPB6ArwkekCSTIIhzSDONIS6t7UaPKthTeufECKjsRFCiOcw478 tCWA== X-Forwarded-Encrypted: i=1; AFNElJ89JffxJzIFCQbOlCGpxZqbpsQtKqLCJ98qFo65Gayc0UqjKYIxqiIG0fMqApcD8S5SQUpnGgO2Z+7nbxQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyCLnF0h0JYOY7UBpKadGiE5uEGa3Z1G2eo+zsPkZfH99JaFwCS keWnXo+PMb4pHn49VIWK0V0zp4gEmL6XcYY018U0igyz1v0+8s6k6rGK X-Gm-Gg: Acq92OFWH9WJHRFxBpS4uZ7NqmZlkz/hNElthRwRZeECg7kGxVy4Z+z9435dg2yqMDV d8xoFLDDUbZP9nmG+Tl4J3rzVIu0NGagJllb6gVkKGIjagyxv0n6e1A7Nknn8rPYaUrXKekpvq0 Jl2wOZE4hTKC4Xcon/PAz0kMuQxb+G5YVhECRHnAUzYmcgRQ4PCkXldU/8ktnsSLoEduzv7Cp/M 30/5gljXd20QWX1qv5HbkDEHdZZvEksoeu7NnF5+p65fwvzpIVNMUHG77LvY5QNAjl7LhORK4uC NHlrW9EctLmnHnv466l9eiNgJrlDfAUHjuTASMU5HGQ5J5QTw3RQdlMAFAlnteQil3P/ED/z8dG x9WjscI/X45VFlviP1miOLBOy23s9grYHHdi4OIvuPffk/rB0cjgBvofGHE1NJBLFqzOogWE4h3 9b2mzSyhM9M5RcjKLJWuW13O1OS3KLt83Nld+4erabi6U7k4JxnPfq/x3Alc58/PDsE88u X-Received: by 2002:a17:90a:e7c2:b0:366:1bab:c3d6 with SMTP id 98e67ed59e1d1-3661babc819mr5812280a91.10.1778236762673; Fri, 08 May 2026 03:39:22 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1d27109sm18309345ad.1.2026.05.08.03.39.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 03:39:22 -0700 (PDT) From: phucduc.bui@gmail.com To: peter.ujfalusi@gmail.com, broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, jarkko.nikula@bitmer.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, bui duc phuc Subject: [PATCH 6/7] ASoC: ti: omap-mcbsp-st: Use guard() for spin locks Date: Fri, 8 May 2026 17:38:36 +0700 Message-ID: <20260508103837.138142-7-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260508103837.138142-1-phucduc.bui@gmail.com> References: <20260508103837.138142-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: quoted-printable Content-Type: text/plain; charset="utf-8" From: bui duc phuc Clean up the code using guard() for spin locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc Acked-by: Jarkko Nikula Tested-by: Jarkko Nikula --- sound/soc/ti/omap-mcbsp-st.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/sound/soc/ti/omap-mcbsp-st.c b/sound/soc/ti/omap-mcbsp-st.c index 901578896ef3..b762d5d3e33b 100644 --- a/sound/soc/ti/omap-mcbsp-st.c +++ b/sound/soc/ti/omap-mcbsp-st.c @@ -156,7 +156,7 @@ static int omap_mcbsp_st_set_chgain(struct omap_mcbsp *= mcbsp, int channel, if (!st_data) return -ENOENT; =20 - spin_lock_irq(&mcbsp->lock); + guard(spinlock_irq)(&mcbsp->lock); if (channel =3D=3D 0) st_data->ch0gain =3D chgain; else if (channel =3D=3D 1) @@ -166,7 +166,6 @@ static int omap_mcbsp_st_set_chgain(struct omap_mcbsp *= mcbsp, int channel, =20 if (st_data->enabled) omap_mcbsp_st_chgain(mcbsp); - spin_unlock_irq(&mcbsp->lock); =20 return ret; } @@ -180,14 +179,13 @@ static int omap_mcbsp_st_get_chgain(struct omap_mcbsp= *mcbsp, int channel, if (!st_data) return -ENOENT; =20 - spin_lock_irq(&mcbsp->lock); + guard(spinlock_irq)(&mcbsp->lock); if (channel =3D=3D 0) *chgain =3D st_data->ch0gain; else if (channel =3D=3D 1) *chgain =3D st_data->ch1gain; else ret =3D -EINVAL; - spin_unlock_irq(&mcbsp->lock); =20 return ret; } @@ -199,10 +197,9 @@ static int omap_mcbsp_st_enable(struct omap_mcbsp *mcb= sp) if (!st_data) return -ENODEV; =20 - spin_lock_irq(&mcbsp->lock); + guard(spinlock_irq)(&mcbsp->lock); st_data->enabled =3D 1; omap_mcbsp_st_start(mcbsp); - spin_unlock_irq(&mcbsp->lock); =20 return 0; } @@ -215,10 +212,9 @@ static int omap_mcbsp_st_disable(struct omap_mcbsp *mc= bsp) if (!st_data) return -ENODEV; =20 - spin_lock_irq(&mcbsp->lock); + guard(spinlock_irq)(&mcbsp->lock); omap_mcbsp_st_stop(mcbsp); st_data->enabled =3D 0; - spin_unlock_irq(&mcbsp->lock); =20 return ret; } @@ -241,13 +237,12 @@ static ssize_t st_taps_show(struct device *dev, ssize_t status =3D 0; int i; =20 - spin_lock_irq(&mcbsp->lock); + guard(spinlock_irq)(&mcbsp->lock); for (i =3D 0; i < st_data->nr_taps; i++) status +=3D sysfs_emit_at(buf, status, (i ? ", %d" : "%d"), st_data->taps[i]); if (i) status +=3D sysfs_emit_at(buf, status, "\n"); - spin_unlock_irq(&mcbsp->lock); =20 return status; } @@ -260,19 +255,17 @@ static ssize_t st_taps_store(struct device *dev, struct omap_mcbsp_st_data *st_data =3D mcbsp->st_data; int val, tmp, status, i =3D 0; =20 - spin_lock_irq(&mcbsp->lock); + guard(spinlock_irq)(&mcbsp->lock); memset(st_data->taps, 0, sizeof(st_data->taps)); st_data->nr_taps =3D 0; =20 do { status =3D sscanf(buf, "%d%n", &val, &tmp); if (status < 0 || status =3D=3D 0) { - size =3D -EINVAL; - goto out; + return -EINVAL; } if (val < -32768 || val > 32767) { - size =3D -EINVAL; - goto out; + return -EINVAL; } st_data->taps[i++] =3D val; buf +=3D tmp; @@ -283,9 +276,6 @@ static ssize_t st_taps_store(struct device *dev, =20 st_data->nr_taps =3D i; =20 -out: - spin_unlock_irq(&mcbsp->lock); - return size; } =20 --=20 2.43.0 From nobody Sat Jun 13 09:16:06 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 2095E3D170C for ; Fri, 8 May 2026 10:39:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778236768; cv=none; b=NHwxO3DiCaobPQMsrc8DSZkGajSI8MsN+uE2a0EkgLUJrmt8VGP3bOALJQ7WC5lOOb+ipLsmcmTUSIme+G1WpeYUhsDhHR1aaSxACaZdRiJ3x2d6/ZWvnGtB96QJ4udC/RTidyUfsJs4iR+SzyZzprO/sNpOYrQqxnl5oQz3UyE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778236768; c=relaxed/simple; bh=MLsKqFKAlvte/Ce0NqocdXRNTbr4yO+y0hO4ieQL4ow=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pceO1NV5dUu+UOOM2C8HHPdEW3CDcB2exOUGCUf/wB0IYWgaa9pnd7Gw0veSY914caFQ19bNzfyNdsjDN7bcnleqyX/DXTCRUiGBdPy6oIWrhMbo1Bzu22G1NHS3478eaa102CppQRXieKucQVFcSVyhrRIKh6Kop1Tzf/8gpoo= 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=RgUS7yJH; arc=none smtp.client-ip=209.85.214.171 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="RgUS7yJH" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2ad4d639db3so9537135ad.0 for ; Fri, 08 May 2026 03:39:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778236766; x=1778841566; 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=WOavnxnn6OqOTlyeC3XVG683zOAFflfaW3EaEqxauqo=; b=RgUS7yJHF5S+nPf5JD6tEABtHdxrNtQaJrGcgzx+QrsMr0ophz8FViSpG6miKoIdHy gygFgVGpvdmkSx7wQhbIlSjMvOkY9738FIa670+3IZTNbfPKYLv5QyrQFsSDPxpOoc+A OnRTjr90pZ5DjkOtmVbqTcKGYw81QzSBsUw0ZU8nHNez80VgQUDwEzK6m9mk9FMRXBgE orSdkYBdQHhIzTkqxqZr9D3r4Oe4/3Jk8qYS7JNQK+wfPAD6qTRB6El6hZAXcLQDaQTK d1K0txOJy13tdA8BdPjZ4nZjsEdCCa5ud0y6AvACL7b20oRgkTvcjkJ/1XhaGgAYoheR e+3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778236766; x=1778841566; 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=WOavnxnn6OqOTlyeC3XVG683zOAFflfaW3EaEqxauqo=; b=jbBTsgzHtEhmaVuJTKY7EUcp3fkKtsmZt8mUxkBVjxfes6M3DK+68AsS4+rrFrKlb4 O81Z613Geb0M01vpjLlmVm0QomTDr4Jd1szCS8G2YkdBGg21u1KGhXlwEwsTPxkM8Qf5 qFjRpn1/LHdkTWTTt1/cqBNRZw3rsTFHn8m3YXmVdh2Ca9oEImkKRPmTxXUAP28FcxUj VNFKN5MSycNlbIuKkGIDgbOunNs2GmwkdEbQoBRRRWlsENyRkWx2kl7uxa9EYQfWeWtM 1fRdLDdAFBvafervTi67r1HfIWrE9adbiCbUQ4oNbDBpdAX4741jKbdWbYptlDaC74cV mJVQ== X-Forwarded-Encrypted: i=1; AFNElJ/3BbSng7bc6V5xGyyfHLcVSumrJ+x/nNjz6UegYUC/UyvYp0i9wGCd6GX8F0xTrkNdz1LQDv9tUMRfOJ8=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2NLDOniIoMJ7fQLBWS7kF45//27DbwJVutqvo1Ufleur/bB+N 6XRL/pzzLuZtCXS/s+6GqPKLjPB32fS8wxZzMJAeae3CYV/Wey/I3MReck7aMg== X-Gm-Gg: Acq92OEAiPCMHTqySzvrBr8JsIiMk1fO55bwpwNHkTrVWPwQwRMon/MrtUY7U5luaxP y54kHLdj/2WXgDtQDnNbyGli49rtxaA+aEFO+kjVz+Jij6coBO+czqMCz1McFiMkqm9c9akc54s 0+3Qyc7xIUvyzMMQFNhefb+gOQTIn4PXCfkHKbiYNzxu8ZvbRR0bzBk4qQg8N9SvT9lbMKhfBZP i8Hr+nSBPd2TbQmPQC1Jc+XLk09mP610iz8kA91GJ9rHKd6fD4jPAUICNzqjPhtnL61ZRqChOyh ErsmPQrHfspIi5Fv98zOZYx6XK2/AclZBAzikUM1GlpPob961lQMffBPtPTqNCv627nXt0nw0Vd HnXKSf26J4xJZRPBbHB39qMVbseXcfREMeAUXE0OxstmcToc/Bu73mwPDpSbRG7HYZs7Eqy9vlg 7hdNnbLRmyBRKvAuvg7KnI9zoWX9vgNAjrIvZ4nCviVl2PoN9UZ20rTpT9kw== X-Received: by 2002:a17:903:3887:b0:2b9:6453:389a with SMTP id d9443c01a7336-2ba7928595bmr126945125ad.8.1778236766474; Fri, 08 May 2026 03:39:26 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1d27109sm18309345ad.1.2026.05.08.03.39.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 03:39:26 -0700 (PDT) From: phucduc.bui@gmail.com To: peter.ujfalusi@gmail.com, broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, jarkko.nikula@bitmer.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, bui duc phuc Subject: [PATCH 7/7] ASoC: ti: omap-mcbsp: Simplify lock and resource handling Date: Fri, 8 May 2026 17:38:37 +0700 Message-ID: <20260508103837.138142-8-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260508103837.138142-1-phucduc.bui@gmail.com> References: <20260508103837.138142-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: quoted-printable Content-Type: text/plain; charset="utf-8" From: bui duc phuc Convert spinlock protected sections to guard()/scoped_guard() helpers and simplify the cleanup paths, including the reg_cache lifetime handling in omap_mcbsp_request(). No functional change intended. Signed-off-by: bui duc phuc Acked-by: Jarkko Nikula --- sound/soc/ti/omap-mcbsp.c | 54 +++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index 411970399271..d82fef629867 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -290,23 +290,22 @@ static u16 omap_mcbsp_get_rx_delay(struct omap_mcbsp = *mcbsp) =20 static int omap_mcbsp_request(struct omap_mcbsp *mcbsp) { - void *reg_cache; + void *reg_cache __free(kfree) =3D kzalloc(mcbsp->reg_cache_size, GFP_KERN= EL); int err; =20 - reg_cache =3D kzalloc(mcbsp->reg_cache_size, GFP_KERNEL); if (!reg_cache) return -ENOMEM; =20 - spin_lock(&mcbsp->lock); - if (!mcbsp->free) { - dev_err(mcbsp->dev, "McBSP%d is currently in use\n", mcbsp->id); - err =3D -EBUSY; - goto err_kfree; - } + scoped_guard(spinlock, &mcbsp->lock) { + if (!mcbsp->free) { + dev_err(mcbsp->dev, "McBSP%d is currently in use\n", mcbsp->id); + return -EBUSY; + } =20 - mcbsp->free =3D false; - mcbsp->reg_cache =3D reg_cache; - spin_unlock(&mcbsp->lock); + mcbsp->free =3D false; + mcbsp->reg_cache =3D reg_cache; + reg_cache =3D NULL; + } =20 if(mcbsp->pdata->ops && mcbsp->pdata->ops->request) mcbsp->pdata->ops->request(mcbsp->id - 1); @@ -352,12 +351,11 @@ static int omap_mcbsp_request(struct omap_mcbsp *mcbs= p) if (mcbsp->pdata->has_wakeup) MCBSP_WRITE(mcbsp, WAKEUPEN, 0); =20 - spin_lock(&mcbsp->lock); - mcbsp->free =3D true; - mcbsp->reg_cache =3D NULL; -err_kfree: - spin_unlock(&mcbsp->lock); - kfree(reg_cache); + scoped_guard(spinlock, &mcbsp->lock) { + reg_cache =3D mcbsp->reg_cache; + mcbsp->free =3D true; + mcbsp->reg_cache =3D NULL; + } =20 return err; } @@ -395,13 +393,13 @@ static void omap_mcbsp_free(struct omap_mcbsp *mcbsp) if (!mcbsp_omap1()) omap2_mcbsp_set_clks_src(mcbsp, MCBSP_CLKS_PRCM_SRC); =20 - spin_lock(&mcbsp->lock); - if (mcbsp->free) - dev_err(mcbsp->dev, "McBSP%d was not reserved\n", mcbsp->id); - else - mcbsp->free =3D true; - mcbsp->reg_cache =3D NULL; - spin_unlock(&mcbsp->lock); + scoped_guard(spinlock, &mcbsp->lock) { + if (mcbsp->free) + dev_err(mcbsp->dev, "McBSP%d was not reserved\n", mcbsp->id); + else + mcbsp->free =3D true; + mcbsp->reg_cache =3D NULL; + } =20 kfree(reg_cache); } @@ -581,16 +579,12 @@ static ssize_t dma_op_mode_store(struct device *dev, if (i < 0) return i; =20 - spin_lock_irq(&mcbsp->lock); + guard(spinlock_irq)(&mcbsp->lock); if (!mcbsp->free) { - size =3D -EBUSY; - goto unlock; + return -EBUSY; } mcbsp->dma_op_mode =3D i; =20 -unlock: - spin_unlock_irq(&mcbsp->lock); - return size; } =20 --=20 2.43.0