From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 C4D973D349A for ; Fri, 26 Jun 2026 06:14:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782454452; cv=none; b=n89Ld5cC5mkxbpED2ORdrm0Zdr8JfvE3Ye+/gbWCUevQJPoCsaxjCXO4JH5ULJyzeY8EFBCNFX9ZqJH8j2d9CsD7vwlnSfzlmh6/ZpRc3bZ4A/Tr19bZYogRXrthchZlvS9XrI6Au0V4CJS3bzqhjJzD5ECvk7xlsXSE8btG3EY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782454452; c=relaxed/simple; bh=AqSKMzJhrln5rJJaKew1kNIMMHkqQq35uyMPzg1QGgA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mgpn1auC2L7ieMx5xRVPcm7zFyNbFNodEyCAj9xAHqrCg0uF26N0CZVAV1Frcw4nLF+Ba+nhNmn62ur7qRg2+/+jS1r5/5+gXl/U0KLk4jSOc+T8AAUW98z+BTjYNJzPJYYd5LKanH5jTX2inkq4Bhn55oyAmLbuwq0om5QCnnY= 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=qt0u2SwK; arc=none smtp.client-ip=209.85.216.54 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="qt0u2SwK" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-37df416c44bso341431a91.2 for ; Thu, 25 Jun 2026 23:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782454450; x=1783059250; 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=e7lXoP7p9Ir4aIi8W6zZOzzy0XA5jw3NqQUJ3RaYm84=; b=qt0u2SwKJvf5H/VxgTbFddB55DZ+1IcX2V2lWYQjSRIi7wlYpbcR3krDxnMBk+3uaf rRfitPGo7RhNyM2bFc56QL0EVDs74y4Fwc/1khy043QVgTlIrzpV7OCgOWoFCSBzGUud aV1AaH2vGWGXGWQu69J5OueS6IG2Y6+RCQ3tCC1KQgoORilcNXk/+L4s6J3aL7PVzuFp 4EknR9EpCdBMzjVjYfVMtztVpDFkOkPD3/cdWF/1COYaGhA2r0DqlNO+KNDj7yX1QVVB IdYpSSHL5hE5vb0BVgW1lWFIpHXPQuoM6UV+j2BQl+Bo4M1M5TksnuIpfTjJhpDBJlF3 qhcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782454450; x=1783059250; 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=e7lXoP7p9Ir4aIi8W6zZOzzy0XA5jw3NqQUJ3RaYm84=; b=b48hgGdJt1bsc7FeTxhwZMBdDw9G9IfqvMg2iPtBRdlGpgONp89dDmYLQ23cO2XOfw 03QS0OJi5iUZIjObIRaBtWRcG09UetqsGdXzPvzI2lMsbGmdgmxj2y19X+Ho9WPFVHG8 FiQVttvtmJtfxhV7y5zEA9FSy6owgnbvDAfyKI+sJ3XWHOUrD9CkUl7cQd+G3rk4L41D dMPa6oPsGes8AnB7r66IE9E7MqjxBT0SdLWUu57jrANyoM6ddmIEZM6Jkl7lOlltCSX7 LXnOC5lQjz2CrRvS6miqj1ZQUR7u+QfOywI3Nacx+dTFmMYojrEivI/hhU3Fo5xGXciG C+rg== X-Forwarded-Encrypted: i=1; AHgh+Rq6zrfzScm9UrIZfpwI0elnVdFOLy5TRTesVfoSDBVAzXOjZnTSnlDGgbHo3O75Z3DeKKmkMCn228U6X4c=@vger.kernel.org X-Gm-Message-State: AOJu0YyXrYSasUe27PybisHEjeLMPGJTCMH7FE0Dtrk2euzEJcks9axE ZYTtb1t4taMYK9vUiG+DNpiZ9oXFzvUSNSZlWb/xhWFPHM8W4rD3+KOQ X-Gm-Gg: AfdE7cnEwaOFRhgD9MhTg8QZnSlGVoWlToaeYclmbbMbZhHEtD/YHGcBfqoM3WHxjMz Ge/H7l9F0fgDrl72QTGO/vO2hxz11d7q7Ql1OEApK93RWVP7U/KL/xWe/mr0vUfKC0iK8c6z1It Hi/Tz47l17ie6uT7PG4VDhoPyn/i2cByFz3Dmn6Uv74A/4I16xVmmEdWfgXNKOoBKcFtFEx50+y xDpPY6VgxuMv87EMpsxpXQ6XdpnCL/nB4epI0sKYG1SE1VmcQNoMWHotCIPi0UXHua/ZE0XVboU IAzex+y9esJnB0aGfAiEBF8zPSyprtcbmYXVeGV+Sx5TFgKhztirY95sb8v8CXZ8qAg4fy48oIF 80PL4E/zYRSoB+qm6qPj96UgV4iBpEemmc9tPMPfbBo4PegOWAZnYNK1a9c2Epgo85QU/yGIItm BQghfpNIVEotP5Ww2pCjXcjk1pxafjcQeHQdJ4m+WrfRm+V0Y= X-Received: by 2002:a17:90b:2789:b0:368:83e6:ca95 with SMTP id 98e67ed59e1d1-37df9e976b2mr5533977a91.0.1782454449972; Thu, 25 Jun 2026 23:14:09 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37e12da6ec4sm302051a91.2.2026.06.25.23.14.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2026 23:14:09 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Takashi Iwai , Tzung-Bi Shih , David Rhodes , Charles Keepax Cc: Liam Girdwood , Jaroslav Kysela , Cheng-Yi Chiang , Guenter Roeck , Benson Leung , Richard Fitzgerald , povik+lin@cutebit.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, chrome-platform@lists.linux.dev, asahi@lists.linux.dev, bui duc phuc Subject: [PATCH 04/24] ASoC: codecs: arizona: Use guard() for mutex locks Date: Fri, 26 Jun 2026 13:13:09 +0700 Message-ID: <20260626061329.23264-5-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260626061329.23264-1-phucduc.bui@gmail.com> References: <20260626061329.23264-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/arizona.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 8c683b0bb74c..4411165c3734 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -7,6 +7,7 @@ * Author: Mark Brown */ +#include #include #include #include @@ -1158,17 +1159,16 @@ int arizona_dvfs_up(struct snd_soc_component *component, unsigned int flags) struct arizona_priv *priv = snd_soc_component_get_drvdata(component); int ret = 0; - mutex_lock(&priv->dvfs_lock); + guard(mutex)(&priv->dvfs_lock); if (!priv->dvfs_cached && !priv->dvfs_reqs) { ret = arizona_dvfs_enable(component); if (ret) - goto err; + return ret; } priv->dvfs_reqs |= flags; -err: - mutex_unlock(&priv->dvfs_lock); + return ret; } EXPORT_SYMBOL_GPL(arizona_dvfs_up); @@ -1179,7 +1179,7 @@ int arizona_dvfs_down(struct snd_soc_component *component, unsigned int flags) unsigned int old_reqs; int ret = 0; - mutex_lock(&priv->dvfs_lock); + guard(mutex)(&priv->dvfs_lock); old_reqs = priv->dvfs_reqs; priv->dvfs_reqs &= ~flags; @@ -1187,7 +1187,6 @@ int arizona_dvfs_down(struct snd_soc_component *component, unsigned int flags) if (!priv->dvfs_cached && old_reqs && !priv->dvfs_reqs) ret = arizona_dvfs_disable(component); - mutex_unlock(&priv->dvfs_lock); return ret; } EXPORT_SYMBOL_GPL(arizona_dvfs_down); @@ -1199,7 +1198,7 @@ int arizona_dvfs_sysclk_ev(struct snd_soc_dapm_widget *w, struct arizona_priv *priv = snd_soc_component_get_drvdata(component); int ret = 0; - mutex_lock(&priv->dvfs_lock); + guard(mutex)(&priv->dvfs_lock); switch (event) { case SND_SOC_DAPM_POST_PMU: @@ -1222,7 +1221,6 @@ int arizona_dvfs_sysclk_ev(struct snd_soc_dapm_widget *w, break; } - mutex_unlock(&priv->dvfs_lock); return ret; } EXPORT_SYMBOL_GPL(arizona_dvfs_sysclk_ev); @@ -1657,13 +1655,11 @@ static void arizona_wm5102_set_dac_comp(struct snd_soc_component *component, { 0x80, 0x0 }, }; - mutex_lock(&arizona->dac_comp_lock); - - dac_comp[1].def = arizona->dac_comp_coeff; - if (rate >= 176400) - dac_comp[2].def = arizona->dac_comp_enabled; - - mutex_unlock(&arizona->dac_comp_lock); + scoped_guard(mutex, &arizona->dac_comp_lock) { + dac_comp[1].def = arizona->dac_comp_coeff; + if (rate >= 176400) + dac_comp[2].def = arizona->dac_comp_enabled; + } regmap_multi_reg_write(arizona->regmap, dac_comp, -- 2.43.0