From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.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 26A2C37F8C1 for ; Tue, 7 Jul 2026 05:10:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783401053; cv=none; b=fNk9h0IOjor3cQ5dEcIKpLsjQO01QkqCFTxIZInx7yADV2LdRjwxUJOOFmjRXBjngXy//TzGH/3rOnEK/TTb38/2tdn2+maOzw6bHYl6xIbbGsok1rVAg/HrvA9mWIVTEuCWNqQf++T2ixNdrIRlyB+4r56GKRE68N6W/B/uuK4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783401053; c=relaxed/simple; bh=09+uHExlisne1jIooukG5gRoEn/YSMdFeZBQ6FKI5q0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R1W4YhZe0lVqp7269qdXPX7BPblXXfAtlxSw3V2soqeAmdbd+UJhTApHWy1YdiOnpYNwodGoZ0XmGJxtdV08EDk+22DzFHBil04ZJn03Sz6YXmI8yD0WUCSkulL/qN7skgVuo8HZODGh3tg49Xwz8L7cTYsxVXUbn4YBULDZtAg= 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=GAG+A2KN; arc=none smtp.client-ip=209.85.210.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="GAG+A2KN" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-847e6f03df8so4558227b3a.0 for ; Mon, 06 Jul 2026 22:10:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783401050; x=1784005850; 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=hagTq/6ZaI2+r9Hot5OPuLrYC79qm3HVss9ILqnQ1PI=; b=GAG+A2KNb/gmf9ICd3JvC0q67uHzZY2uSx6bT6I7VVVpFD94hgKH7BW734MsmRIg0U hIMItljSk3ysoc32DR6LpypfXi1wX+dGsdTQxXoV0bjLQ8r8stco1cKQ/ICEgSsy976H b8PTRSndI7NzzD2WVbIn+JNnLXTkSdSv8FUqiUqTFtoMs6t/ACY65y93clQEzy+ZUR/Q Hd9agl6J7dVdkCimKvdjeE6XaeEqs25wXX8vYHwmtvuvlFgoRXd/ro97JhA3DdClTLUU EWTXQkf/WNqC5kJmlHKkJ7WWTBnOB80BgSUjYbYuFcDPiEhlTNM02FFds4JCcADhzm6E K8rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783401050; x=1784005850; 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=hagTq/6ZaI2+r9Hot5OPuLrYC79qm3HVss9ILqnQ1PI=; b=HZvjTG5zTsDqjq+DOXLtY0VKXWoSEUa85s/9BoUmJAs5F7u7i7ZsYqUGGI+TfCxL+N RSz3ySf4ZDS3iTQjTdd2BH9lp6Z4HmgOHQl/wrWD+8vwkRy+DMGx5WPBN2EWSUkMH/0g NKBooifpNBIFdxsFQy8wRV7gi7GDtYbN17HkOVZELKJ8HiKA1i+PpPw4FmZYrm5XCsx5 O7GP4fJgOB2VOr3+8cleO4OSEhTGGqofgV9uCQr8EtY79h9R1huRQ2lp6+g6ZfGvM52R bJLvYzhTNYxzv3t19tHrI9B3ccdPgi6/+YcRmeM4lfj06UcK2LdK/2el/f/QChhudSK2 +DCA== X-Forwarded-Encrypted: i=1; AHgh+Rq2CstStP1jjp2bq6Pdpjf1LGLodiYr5vPyrG3yKzUp2Zqo18gT6NOS/CbVftUk5+NIUYoHnFHikImg9ZQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzjZHZW99WVydTv6A4U376OapSDoRwDlE3XjF3qnYKa+ZpRdM5f aA/5cD/cJpaThgH3kIVeAnDtJEXfPhXopN/Qios8YICPWSNdiT67EK5s X-Gm-Gg: AfdE7ckdTcSutxfNDRVuNNnZ8Etd4TRP31H2E7TaDhAj11s/N2BlKFYwLqwXqdhwvI1 yxvG5nvbpw2lnxb5NG1FZ3IcPM9qM4PkcQrmrtoS0Dxvtko4nJBeB/a23Y5TLjXTcLMO5H1+YOT jNPA2+jgxdV5GHKSLhtldWQ8SRd8NL0OJ5DEYTIPg93YWKrOzaIRFcWtXahnZjIE+eqeWTb6h+4 5GuLoi7sXc4mSitmilaPNRYTbsmBXR2y0C0GgLR1V6gu+d2ssb59gEXHgHHpjlZzfS7xhPdLWqp Sgl/PqN0mrlRRnCH0DRAB8kjmVAoZUoPTdRRa/nPg3sL0TU/N2fssiAAFy2/XC4GQzl99DQT//e PoNhPOH+i6bFlYtI6nXwAWiTjaPnVcLrlZi8Lpg/tGhe1Akug4FeYXtQ6isrs7nr72AlPWN4Cx5 RcH5PIea0HdcQpQml6G2oUZSwQ+CYFHt/WLllsF+L9udBJ89A= X-Received: by 2002:a05:6a00:2e87:b0:845:4928:8645 with SMTP id d2e1a72fcca58-84826c1ebfamr3415918b3a.7.1783401050517; Mon, 06 Jul 2026 22:10:50 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847f6d4dbdesm4728495b3a.31.2026.07.06.22.10.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 22:10:50 -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, u.kleine-koenig@baylibre.com, kuninori.morimoto.gx@renesas.com, christian.ehrhardt@codasip.com, Linus Walleij , Arnd Bergmann , Sakari Ailus , Thorsten Blum , Chris Morgan , Dan Carpenter , Marco Crivellari , Rosen Penev , Weidong Wang , Teguh Sobirin , Val Packett , Luca Weiss , wangdicheng , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, chrome-platform@lists.linux.dev, asahi@lists.linux.dev, Cezary Rojewski , bui duc phuc Subject: [PATCH v3 02/24] ASoC: codecs: ak4613: Use guard() for mutex locks Date: Tue, 7 Jul 2026 12:09:44 +0700 Message-ID: <20260707051006.20058-3-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260707051006.20058-1-phucduc.bui@gmail.com> References: <20260707051006.20058-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. Reviewed-by: Cezary Rojewski Signed-off-by: bui duc phuc --- sound/soc/codecs/ak4613.c | 83 +++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 43 deletions(-) diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index 3e0696b5abf5..be5306d07d40 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -95,6 +95,7 @@ * see * AK4613_ENABLE_TDM_TEST */ +#include #include #include #include @@ -384,7 +385,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 +393,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 +507,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,45 +598,47 @@ 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; + if (ret < 0) { + dev_warn(dev, "unsupported data width/format combination\n"); + return ret; + } snd_soc_component_update_bits(component, CTRL1, FMT_MASK, priv->ctrl1); snd_soc_component_update_bits(component, CTRL2, DFS_MASK, ctrl2); @@ -645,10 +646,6 @@ static int ak4613_dai_hw_params(struct snd_pcm_substream *substream, snd_soc_component_update_bits(component, ICTRL, ICTRL_MASK, priv->ic); snd_soc_component_update_bits(component, OCTRL, OCTRL_MASK, priv->oc); -hw_params_end: - if (ret < 0) - dev_warn(dev, "unsupported data width/format combination\n"); - return ret; } -- 2.43.0