From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 0DE62346795 for ; Fri, 3 Jul 2026 05:54:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783058076; cv=none; b=GNpkRR2/TS5c/cz7W4YiVdoco2SAUcSmr8kMZk6r+926NcAKhQoQa4a9SwVlgdFUEX0omq3+M5IXuY2nt2ej/8Fn/P8ceFUZeyDlSVuncSt50u5343RbXhgbnegpQJYD4OZlc9JgGCLSVRBK7ePrpISt5367IeQ44DTamCALiHI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783058076; c=relaxed/simple; bh=VBywIEI+mrkeBMiuQwNmf5i2jTPdGPDjHD+MzsDCtuE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q9dxRKWRp8zIEf74pvJ93kwAfmXR2Vk7h17gQcBjl4OtsWZSCO91L0JXXv5aVBEHwffE+Ta4Izfz4trZmna1snysd1y4EvGF5KCBMRal7kbIxJ9hPZGC18yp/ELO3AUv7Th9JsQpUzS0lUcmp2ltpaiq1A22vrAAI0gE+S4r6WQ= 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=EveJG09a; arc=none smtp.client-ip=209.85.210.177 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="EveJG09a" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-8478a25f268so122610b3a.2 for ; Thu, 02 Jul 2026 22:54:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783058074; x=1783662874; 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=r4Mllffw4khwUVvJSV3KZtob20XT8yXXusLnJJ8LlWE=; b=EveJG09aFF8k1KdL4tD2lT24Uk861/d/nx7v3XrRl196qWZUE6tS70gkwT2N1UnGWX +2nK7iBUxiUoJ684HPcUP0Mfu/bQpFVYXW+hVIh6xEWENbqRE6Q2qzs2CZBhuKpqptTW lx+QJHJCquHhBsTuqT60LkLo8w7VWZH4E4BGGjWD9VHzysFhNXc6hZ0PbGCYTT5rjbls B6ERNga1salSNcX3Gv7icCSiTaSLKbvKfe2CmUe6WdWaduES0qC++4ieFBz6ZlmC4za2 erqjFu9m83JzmGgO8am8ylauM3efHIRh95KPbLjqwQ1xJmNXEP3U8YaAqW58eP6MFTw5 EMFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783058074; x=1783662874; 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=r4Mllffw4khwUVvJSV3KZtob20XT8yXXusLnJJ8LlWE=; b=mVuVS5g5rJAjjnxvK9Xwu4wBxeytLucKGpRaBdy6ROkA8NczauBw8AEmwqdiud2Kzs QGClBM2YUvAGmiiUOJdpghg9jZlVrypSzAvCwjjP9IN+P6MGm5kzI4peDdcUBGMd/Ud6 5SE4kzCMtGDFBO8aQBGheM1voK5uzlU2mZ8I1v+wIrv/On9gh6ndhuJ0RdLEQT+8tkBr sgonogaF+UUvRTvdGRXTrt5CBtjacC+KoXgh+hrMZUtO/SkTxh+lbbMNWaZDrMQpSLkd cs+LHVG1keqeAFzLF28taSPUygl7XVMbZ8hajvDB9ITcawoFgiT/lqYTSIhMUpSvTSPg zLww== X-Forwarded-Encrypted: i=1; AHgh+RpD+pWccs7/g0x/rKnvGsFVAhGZp9tmm6E1wfIuOlgoDpzM4rISUA2A9/f454Kn8kRYmIJYqj8UOevB/Q==@vger.kernel.org X-Gm-Message-State: AOJu0YwwgGkqbMmduWQCHZEFkI8H4hSwffEOE7QNxAHnUYsZA4o200Kv YbN65MzrhRYTUHTkCukkxpa/QJVYKyZCr/21PLbdvg3c3NTgSrySKTrN X-Gm-Gg: AfdE7cmKSAaLqU2yHXQv4G5AynQRygCZtDlVaTGIeRebfUMjWelDE8o/1NsoPbMaec0 kcBHPO9b/XUvY2CXb+WrhG78fVuQWglsILj8eTdA7t80+cKpQpBQL1tpbBrgmoiRcLOHdp3cC9I Gx4Bq31drWoG1sG6IZvGG75DpN6bHAudmWafYvKdlymRDouI5RGch+0UQnmTv5zX4DBZwt0pQMH i+4FPUSDdp7qrwk2MfpatfzRaCUZ1nFcNxLRvPw7LYBzRMMICasTmPyMe94VFeEyvlaLeiwxHPl RSPG6IRkzNBRcKc/1c55ectBwNQUSRsxbjWzLrpWgNVftgWQHiIrC1qG6BPMFy4ZsOlfdZ1qiCa gOeLpGFHTgpF8NRmW+Hu6jqauC+IaYYfbWjsQkzC2NDviAV04zqGH4hCD6AYaV1IPT0ze7YdK3v avjtFtjkLNvLAOpzdRHOAUM+hYJohE88vTPZn6XWtupeFd4+Q= X-Received: by 2002:a05:6a00:3c90:b0:847:93f3:a4b6 with SMTP id d2e1a72fcca58-847c506d4e9mr8520379b3a.17.1783058074207; Thu, 02 Jul 2026 22:54:34 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847cb94b3e6sm2340028b3a.33.2026.07.02.22.54.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 22:54:33 -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, bui duc phuc Subject: [PATCH v2 02/24] ASoC: codecs: ak4613: Use guard() for mutex locks Date: Fri, 3 Jul 2026 12:53:33 +0700 Message-ID: <20260703055355.244898-3-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260703055355.244898-1-phucduc.bui@gmail.com> References: <20260703055355.244898-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-sound@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 | 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