From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.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 AA90737F8DC for ; Tue, 7 Jul 2026 05:12:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783401155; cv=none; b=S54GouaCQ6HbaaTjRTJY7hOcvffO7765fyfLrD0iSwVWgs9W37/kN+AWzMWM8VQ1rfL+KNkath2Qm5ly30TRQP/TaXi8pxrdo8tZF7Cm+1GW81bP4dMy/1HP+EuR5afC6kYsjl0cv+t+gBsiOS9saC1qVwadVYMNfzyLEhQ9BRk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783401155; c=relaxed/simple; bh=l+jE/ICW3VwCjHs5/VwCJgnhBYlTFKeilmi/IdexrH0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UgWnPEr450G6QwSmv90wO4ImgJu/ApO3waXR4MMBztmeLtL1m2b2AJk/9d2VwCn737zIn/kYK7VZ1cheXj2W+Mucr7MX8YkpIzcPj+Y1oVpkZPpR0NcQ3QZe0wHdMu1BzrZMrEXGVGXgd3E32gpqbkn9Uxl6vV5aPxQrALs23ok= 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=jE1lLtfR; arc=none smtp.client-ip=209.85.210.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="jE1lLtfR" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-84347ad88edso5058765b3a.1 for ; Mon, 06 Jul 2026 22:12:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783401153; x=1784005953; 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=nYGM4NqjESQUWIB0GyhH+Inqu4fPaZ6H5/Lwh6w+p3g=; b=jE1lLtfRLM3RP/kJoKga/GyzUVtvZ9tmFudZQYjQFmGhkIaHw+94aNoTRI8u2CaQrG /wR1dImQErn9j2quDw2NcBKnfQ3P5IJGitAXR32bszNwflFIMDoWMjIoDpszxaXafpkv bK+uXLzxSQtv+Od36hZFR0kXchhtSoZgHTN5KkQDMgbScDIY4X+ywoMkEbUNdtXFezPX YD2wnc61LlKC1CX1z2lagT8Om7IcWKaZfSo+bWqXAiKtO1aJ1XP9TlswckS/8jdZe77y GNVX1zzsE2dxa05WSe4rx1jvXaOqurXSEqhJdVAWdwKWbTTKUAQlQkfBUfZvZjMWZss/ Uz0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783401153; x=1784005953; 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=nYGM4NqjESQUWIB0GyhH+Inqu4fPaZ6H5/Lwh6w+p3g=; b=imcG7VIJU2Eg/rJSOUsyixQBetTxcVIjbUEs51wc/2ZLL1bvuRdFNhl37PBgKdK6kU +FdGIk3MoalGjKBPaMRUiIJRYFC1je/iEevVG1cFBvp7Dj2ybK33mkeA3QFZL/x0TpMd qc6RNZXZkb1cmI6lZDDwLkr2HFS8Mwf0QBzHfwrrFi7T7JDOusqOhaR2pVAvlbM5PhNE SwZ80RsLpN+aLpn16OwiV6XI1bMYa1D/RW+VS4TxmOlee60wxo0scusQKUqH8Dvf/o5B vi41BugLB6qi/7pbTKaIPCspF4guFz1Mi6bjMuri8F5i60FBUSgrrSiIegJeeVjsWDhZ 9o0w== X-Forwarded-Encrypted: i=1; AHgh+RqCXuc7SK0ZLW/o2fb2T/xOV87zS9d2xnAfhRjaHKqQGMEtFnsOREX3qUgwSgE8wirTMZd7cEILf3C/MjA=@vger.kernel.org X-Gm-Message-State: AOJu0YxvvI6MIskRIxWi6tbxyTvomfOjHlrjdmSs4aj8eI53zfpU9GfC XAsEohqUUv7SnyMP8WcG9ooYmUu8EwNk/vUyMV7Jf265UafQQBXfh/ou X-Gm-Gg: AfdE7cmf8COmqLo37y1bAeq8ZLgDBQNXsTxaNMFYrkuO7EHsZMhinrgVVB68pHlYBkp RTrmJmFClGuWBLAsnlhvC6P6x0Vuml4BXkNXfPVX5sDa9ziIXS7tO2rgcCZo5Flk4il+hD9J9kr 3zqdSDmYaM4poQSnBqQXuGvNTSG/NJjblbrNv5ms6QNw22ICulScjRzXNpWKrDkWFxD4NiCqgbc 4OJwpG86DpOf/iAueR7+aZJfokqbd3JcswCOSKMQQHJDbRCUkZx0k+p/E4e2eG9nf1Uh/n7Guk9 4Z8Ag1T+FSOp2uzB/m7o3IoQIjSSVfFfhWv4oRPkYzSPAARwzwZ7WGqRyHDN952v8iCDdLga7wF J6mudIXG/1LrNjm11kqjUGlQuLULY7dVHfx5VYWZlCmVjFFLS9maBYRjkCU73IZYLSLcAxY/0/+ vXYdad9tLQcBLcg8y9HXMdQjdOTK4YgFp/DF6OTt8M3B5zdvo= X-Received: by 2002:a05:6a00:bd81:b0:847:8650:69cd with SMTP id d2e1a72fcca58-84826dad939mr3557020b3a.33.1783401152996; Mon, 06 Jul 2026 22:12:32 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847f6d4dbdesm4728495b3a.31.2026.07.06.22.12.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 22:12:32 -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 11/24] ASoC: codecs: cros_ec_codec: Use guard() for mutex locks Date: Tue, 7 Jul 2026 12:09:53 +0700 Message-ID: <20260707051006.20058-12-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 Reviewed-by: Tzung-Bi Shih Signed-off-by: bui duc phuc --- sound/soc/codecs/cros_ec_codec.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/cros_ec_codec.c b/sound/soc/codecs/cros_ec_codec.c index 7dc5a7c3ca96..fd2d5d7f9276 100644 --- a/sound/soc/codecs/cros_ec_codec.c +++ b/sound/soc/codecs/cros_ec_codec.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -608,10 +609,10 @@ static void wov_copy_work(struct work_struct *w) container_of(w, struct cros_ec_codec_priv, wov_copy_work.work); int ret; - mutex_lock(&priv->wov_dma_lock); + guard(mutex)(&priv->wov_dma_lock); if (!priv->wov_substream) { dev_warn(priv->dev, "no pcm substream\n"); - goto leave; + return; } if (ec_codec_capable(priv, EC_CODEC_CAP_WOV_AUDIO_SHM)) @@ -624,8 +625,6 @@ static void wov_copy_work(struct work_struct *w) msecs_to_jiffies(10)); else if (ret) dev_err(priv->dev, "failed to read audio data\n"); -leave: - mutex_unlock(&priv->wov_dma_lock); } static int wov_enable_get(struct snd_kcontrol *kcontrol, @@ -895,12 +894,11 @@ static int wov_pcm_hw_params(struct snd_soc_component *component, struct cros_ec_codec_priv *priv = snd_soc_component_get_drvdata(component); - mutex_lock(&priv->wov_dma_lock); + guard(mutex)(&priv->wov_dma_lock); priv->wov_substream = substream; priv->wov_rp = priv->wov_wp = 0; priv->wov_dma_offset = 0; priv->wov_burst_read = true; - mutex_unlock(&priv->wov_dma_lock); return 0; } @@ -911,10 +909,10 @@ static int wov_pcm_hw_free(struct snd_soc_component *component, struct cros_ec_codec_priv *priv = snd_soc_component_get_drvdata(component); - mutex_lock(&priv->wov_dma_lock); - wov_queue_dequeue(priv, wov_queue_size(priv)); - priv->wov_substream = NULL; - mutex_unlock(&priv->wov_dma_lock); + scoped_guard(mutex, &priv->wov_dma_lock) { + wov_queue_dequeue(priv, wov_queue_size(priv)); + priv->wov_substream = NULL; + } cancel_delayed_work_sync(&priv->wov_copy_work); -- 2.43.0