From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A9830CD98E4 for ; Wed, 17 Jun 2026 10:33:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RRug9eLPJsGmAP+VJnwvB7OkJ9sFAbmMJ4eYi6JABvc=; b=4qyxJeaL9nC4OR4JTpxTKTCkRA 9F+s6Yr+WzivS0LpIleejj3BJT0vSKI8uyBsTDY7JmYiRI/twAGL58lIFsdNNEYMQqskGiJ0WzAFS PtmfaONRHuljP7j0GIcozPyKiUVrSikIUV8gZA1r22qdrNaPpSRei8JclZj4nN8uxpCS5CWsrL1ol HqJ0aEkvDYMCYC4o7FxLckeYFBtY3gqzuMTTMl5HLAl3/fHNlpUzu7hL58hyLS2egIeA1Y0U9IiYm sma0lkmvOsOPIRcaUMi3DSvh2VyoDBVEwvXhv0nW2LWuAVyyp+mlkh5ude4RCwxZk98P0lOyKaw0a E9s1KppQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZnaD-0000000H3gf-2tTE; Wed, 17 Jun 2026 10:33:21 +0000 Received: from mail-dy1-x1333.google.com ([2607:f8b0:4864:20::1333]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZnaC-0000000H3fd-03Fm for linux-arm-kernel@lists.infradead.org; Wed, 17 Jun 2026 10:33:21 +0000 Received: by mail-dy1-x1333.google.com with SMTP id 5a478bee46e88-30bcc877b4cso1620238eec.0 for ; Wed, 17 Jun 2026 03:33:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692399; x=1782297199; darn=lists.infradead.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=RRug9eLPJsGmAP+VJnwvB7OkJ9sFAbmMJ4eYi6JABvc=; b=ZF+zpO1UFuWI7ARJxmyfUFTM/qIh+0xIOkHKY6yWw59/pvMMgMOzfawDsqSZ9C5ynb ft9xqaYE4Of7g8zh3/DUkLEee1MQX9p3SxpMUz4Nyciqrf7iVMqp/owHLnXYww7kvayJ 3ndjjluzwiitlyl4S0aIOJQHxxqeigy1/yx7AK4Yevyxgbtw6N99cWIvnMaJl6bASlEU SX9i0ScrQW5v/Hq9KNTF0jHloQfsMvhS+n4tILMNZlM4szf4/pKxFhGhzXWQLz5euKqm DnIqfwc7+DxiNYfyBltkvdYVMG/qn9qpSZVorT8Jaz7l5rhvHM0hF+x9NjTmiZyBLl2d fQYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692399; x=1782297199; 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=RRug9eLPJsGmAP+VJnwvB7OkJ9sFAbmMJ4eYi6JABvc=; b=jtz4nEeC8O5S/HXRoFkKexdwV7eJ7Fn9Ts9IrHzAdE2cHmoIzfZb0YoFtcKdLk+pAj oCcZEF+wqnBPBO05mmZtFq8C4fY5HDtUq0l2QrMLtQAeh8eZk89WNsj4tcB2ZzKje4ww cpB53CzZ3JQgGOYSpmhTS7kw4jR+GAS8X8ZUr/o0Fml71wUUrICc5Sh6HlD5vkHNXoGk jRnmUMDZ6B4Cn7k21IAt/3oa9VIhN1jYZt+JZHtkAvac0fchvSVz1r7gL5ZShF1HdwsC OC1sZlVX6CrlG3rXweOUyNkuDHbLli+5rhhfDk6ffIyiCc2LjU5vTcsfJ4VMNBN4k9CD nMMg== X-Forwarded-Encrypted: i=1; AFNElJ/4WySD/K91TC8I45T5SVy4Lkc4oQVgTb8gsOgCs9Gae4zInQt/LrV6Z+/6e9viETLl72dsjjG3FM6rzCYPj5/T@lists.infradead.org X-Gm-Message-State: AOJu0YxFDhivYvYpQ8gwdrUrYONRAFTpgqWQdvp0AxUrQmnbtNGpKr4z dghUxdmHMWqKUQhg4sY7+I4O7l7u+YL/BPIi8cQMVHCBg7yO4/5IR1um X-Gm-Gg: AfdE7cn2KAvOmdMpukd/KqZ6migcysaiBgonVZcBDtxFxj6xsLi2wDZZWlWuYVpOUYO OT6Wi4A9hwafBDPT80hifCs5VQIiPEna0hSmNfyibDcFA4LD11ItKxTbojYg16igquE6oyFVT4A 09SPoskR8HWb5Nx3M4yghjtX1SqQBS+5oGeLCWc+beGbXn9CYzB3BGPIALiDSZL5ddEQb4Il8AB 0nZfmNP7ZtVW575qjeFi6ZVSE7TSsVicCDqAJAwLF1ffaf+Nujwfzsi9HUX2wsRhFF1o4CRT2pk aJHtU9lHa/hb59nCFvVy19zMGXwMbOVQftdYZAVV4jstbUE/2RX3JtvCTqvbFp2HxzsfsJ+Q9+N /v382YsmcS+mLBHgm6KTvcM7GtmrhAdw30jwNH8agGp5fkfaPS/whM7KI/APJIVXmLzF49NqpwV bQnB0qda841Xp0rLrfyR8E21xK2i6/9DOMhAHKu3wx9/NehD0= X-Received: by 2002:a05:7300:30d2:b0:304:5bee:f59d with SMTP id 5a478bee46e88-30bca0ab339mr1950409eec.29.1781692399061; Wed, 17 Jun 2026 03:33:19 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d0828sm24616275eec.10.2026.06.17.03.33.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:33:18 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Cheng-Yi Chiang , Tzung-Bi Shih , Guenter Roeck , Benson Leung , David Rhodes , Richard Fitzgerald , povik+lin@cutebit.org, Charles Keepax , Support Opensource , Nick Li , Herve Codina , Srinivas Kandagatla , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Lars-Peter Clausen , nuno.sa@analog.com, Steven Eckhoff , patches@opensource.cirrus.com, chrome-platform@lists.linux.dev, asahi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, bui duc phuc Subject: [PATCH 02/78] ASoC: codecs: ak4613: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:31:19 +0700 Message-ID: <20260617103235.449609-3-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260617103235.449609-1-phucduc.bui@gmail.com> References: <20260617103235.449609-1-phucduc.bui@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260617_033320_059261_A38ED829 X-CRM114-Status: GOOD ( 18.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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/ak4613.c | 72 +++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index 3e0696b5abf5..413ef55b918a 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -384,7 +384,7 @@ static void ak4613_dai_shutdown(struct snd_pcm_substream *substream, struct ak4613_priv *priv = snd_soc_component_get_drvdata(component); struct device *dev = component->dev; - mutex_lock(&priv->lock); + guard(mutex)(&priv->lock); priv->cnt--; if (priv->cnt < 0) { dev_err(dev, "unexpected counter error\n"); @@ -392,7 +392,6 @@ static void ak4613_dai_shutdown(struct snd_pcm_substream *substream, } if (!priv->cnt) priv->ctrl1 = 0; - mutex_unlock(&priv->lock); } static void ak4613_hw_constraints(struct ak4613_priv *priv, @@ -507,10 +506,9 @@ static int ak4613_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_component *component = dai->component; struct ak4613_priv *priv = snd_soc_component_get_drvdata(component); - mutex_lock(&priv->lock); + guard(mutex)(&priv->lock); ak4613_hw_constraints(priv, substream); priv->cnt++; - mutex_unlock(&priv->lock); return 0; } @@ -599,42 +597,42 @@ static int ak4613_dai_hw_params(struct snd_pcm_substream *substream, */ ret = -EINVAL; - mutex_lock(&priv->lock); - if (priv->cnt > 1) { - /* - * If it was already working, use current priv->ctrl1 - */ - ret = 0; - } else { - /* - * It is not yet working, - */ - unsigned int channel = params_channels(params); - u8 tdm; - - /* STEREO or TDM */ - if (channel == 2) - tdm = AK4613_CONFIG_MODE_STEREO; - else - tdm = AK4613_CONFIG_GET(priv, MODE); - - for (i = ARRAY_SIZE(ak4613_iface) - 1; i >= 0; i--) { - const struct ak4613_interface *iface = ak4613_iface + i; - - if ((iface->fmt == fmt) && (iface->width == width)) { - /* - * Ctrl1 - * | D7 | D6 | D5 | D4 | D3 | D2 | D1 | D0 | - * |TDM1|TDM0|DIF2|DIF1|DIF0|ATS1|ATS0|SMUTE| - * < tdm > < iface->dif > - */ - priv->ctrl1 = (tdm << 6) | (iface->dif << 3); - ret = 0; - break; + scoped_guard(mutex, &priv->lock) { + if (priv->cnt > 1) { + /* + * If it was already working, use current priv->ctrl1 + */ + ret = 0; + } else { + /* + * It is not yet working, + */ + unsigned int channel = params_channels(params); + u8 tdm; + + /* STEREO or TDM */ + if (channel == 2) + tdm = AK4613_CONFIG_MODE_STEREO; + else + tdm = AK4613_CONFIG_GET(priv, MODE); + + for (i = ARRAY_SIZE(ak4613_iface) - 1; i >= 0; i--) { + const struct ak4613_interface *iface = ak4613_iface + i; + + if ((iface->fmt == fmt) && (iface->width == width)) { + /* + * Ctrl1 + * | D7 | D6 | D5 | D4 | D3 | D2 | D1 | D0 | + * |TDM1|TDM0|DIF2|DIF1|DIF0|ATS1|ATS0|SMUTE| + * < tdm > < iface->dif > + */ + priv->ctrl1 = (tdm << 6) | (iface->dif << 3); + ret = 0; + break; + } } } } - mutex_unlock(&priv->lock); if (ret < 0) goto hw_params_end; -- 2.43.0