From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f173.google.com (mail-dy1-f173.google.com [74.125.82.173]) (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 DC30C3F5BC0 for ; Wed, 17 Jun 2026 10:33:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692401; cv=none; b=TUPN+WjdDJlDxxD1UG2kgr8ZsrV9O8VCoAcdtE6DhNft1sSUmO8S9ES/XiUMMlQxnNZuGe7FgYpzfzqhk9BLEo2DrXAJ/j/YGuqGgB4W4iSuD1XJCBuisXJ8w4mn87MNIejBoTnbWMjccEsEoKRGkD902jWZfH+Sa++s979DlKU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692401; c=relaxed/simple; bh=fUlQ+FnQe8ks2Bsyu9vc+jCVXkfhxC4s7oFtyOeVt8k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VOdTg3gj1k/N8aqFPEZ5WH877/vIZ2VVX/dRM90Z8/S4ojQRyGyV4mYFFSHU8xc+lo6VGklMNLU2pHBgBaFWVwOqMrwsfUZdP6fCqTkDm6JNTekTfXT7UtKIiXdGH+ZymudPZSsFvDhFX+YaGtZz18F+MoLbx8zNWZGFVDm9UJI= 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=iyK9wgm2; arc=none smtp.client-ip=74.125.82.173 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="iyK9wgm2" Received: by mail-dy1-f173.google.com with SMTP id 5a478bee46e88-30bcc877b4cso1620243eec.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=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=RRug9eLPJsGmAP+VJnwvB7OkJ9sFAbmMJ4eYi6JABvc=; b=iyK9wgm2j4YfkQDlDKlY0SDsvJC8I2+AC1Gwq5fmoJw5END9BRNEaXYZjTYsD5mepf LAdF1RGnn0EKCiAH1OUxn2YcrRA/rwkvFEgm/TCbHqZPw2aitmKkj3Hc5shsGOkpss7H vUEDarHIGymGJC8paOvhS/RNn8D9dAwWh32pEK94pjC5E3HdgNxZ73Kk6CMve4YvsL46 /MIjmy5VWT/5aaB7zzjhSCIEoCNUpmpYpoLhlY4PfRG5yiEuVM/ND5u0dcunn+ZojVKr 9d/zhqTh4hGKT5QGKjyZ40sTzT9BdjkhbVURpDc7aVTE3pkWxBVVsd8nNUhu3ww9LCBp eWTQ== 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=P7v+Nw9BBnV1lSufEfJhB6YXvMBDhNaP4sUEbjMMtGSkBgBlxfiID/ykRwX9bgLJH+ 8Pdf5/+MuoUgokbeYvlYzwZC5ixYQ1GusIf9+BythareZfguVyltxM/Nn+dc0AJT/MI9 pkY5ohPIJkY3Kh9Lr6I/veyPxEJCX6XwyGTjwU7zOv97ypRqZ3wu5x1FWE3BWpqXsI7K OS/+8RZa3MLyGi9TeqrnW5TCrlwYF0n20umTCNNXtjUT7/3SOk5O72eJE0J0LBep6wNg ys/jXEtM7iNBK0A/xKRpmjPgXTn08XRpSww+fd81SEaTVSyiYgzO9gKnIfTPXJW/U6B4 BLSw== X-Forwarded-Encrypted: i=1; AFNElJ/N31FIFppyuGtRn8eA7LaBmYyc5ZEB2TJrwm42EEje38rDuS6IOLBcbLwoyvh5PPAyv4n+weqPWx7EDbA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz295K/4LKBE3BtiRJ5JwwhaEa9DhDVj0LsI5DFOrB0lLQ4cQiT 3RtA/ZRx+XQ4f6HKLiAaPPUi46yVFI2pJ6O4DztLYesA8X/UeoUHU9Hz X-Gm-Gg: AfdE7clMVstM2oRh7BMS2MxKYyCNwUoZHkdZ6ZV6oH5Hrw3Ru1VleBWQ2Obp/7JAhPj MqLq5s7BkzOpp5z7+GgwK0yE6PSotdVLscYaivUTtWzLwMu8bMMXe6lmRxheAJK+jk+xOLBDFs0 9hIG1k15COo1o+0D/lT/RyJskqwoJiCWQUma6Ft1u2cEDMpBpy1+FXNFyDfHoSzQEH2vtwMPGVw qhimNIOkemmefSFZsL5xGHy48f47+cT/HcWmKMTerY/TqAvwHSC4xRX8dyPTEthW0tAJwCF5/TJ I362KVxuy9ylAwZXBppK7SWpy6G7f912ZNeRqtGBZONja9uBbYD6MYyF0XIN4K2R/7tXl2pB18r JvSSuZr5ePrcyV7gj5AsATy1whaHTgYlQ20bStb9kMxEBoSK3jYOYgKhluXE9Alahql6A0RN5fQ AVkdnPu2p1BVWkQ/sQSGakosnLiuiEaFqRlT6GhTCHBGeOdGk= 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> 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/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