From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 0948523909F for ; Fri, 26 Jun 2026 06:15:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782454525; cv=none; b=dmI19Zoj632Ie1vpUI4YVJhlAEMMpUDNQN3/EOCoGXS/I6Y09lcPJC1dVmYJenpeLJ/99Kt2QkEMdTehslfqx6iI0VwWiyzhMS6YXgA8NeSzj7o2PILk7+2H6mbh8kCkyVnz6DQ1TqoR+ITEx6bV8m+ElxCIoeFQVcWgY1Fs5vM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782454525; c=relaxed/simple; bh=sVJcDLSzvxVc07PKONwqwz7bpyreaHuk9mSCphbPjpk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SHOIgleoQRauomVsM4d7fwxRmU3w3V45FVKjBXxn27Nk7I1yVLZhOxod27z8EeZquDZ866Wxh0lPv0djbYFYPi6X5IiPzn5+iaLhoolRIX4fVAvca7EOWMO5hEdzZSJlcG+9/bfZZyPm+LcE8pAC4kZWsFyWmsvpXJsPuG3b46w= 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=pbEl4CdQ; arc=none smtp.client-ip=209.85.216.46 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="pbEl4CdQ" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-37c6cd1ac98so477755a91.0 for ; Thu, 25 Jun 2026 23:15:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782454523; x=1783059323; 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=OhB1hdZH1RXfYnuHTRXF1+iHxT1kM5V0IWS9nNClVhA=; b=pbEl4CdQa/lN7fWHpoNlnXlMYrZZM2r3/BAEfNu3r2I1UKCZmJSoQFIbByeQENiPZv MCstnJ9Jr0LzDGfZBXEXsBMR1ufBeRfUNwgfL1nq+hDHfKztCfJhrOJnBVLvJjiYlKpy XFETng81RgOK7DI6NTvgeLrrqs+SiTgSNTUIKfOOO1wwJNVeZP/5+7ZiOCL7P0fZoS8M FGIkaXoJK6ikNtXuryhjbuRlcwofN6vQh7hhyOt9etOxYjXrjl5vECHiva0xSUSb27HP gTXCsRivuAq6i56u1/S4ZlfeRrSt1EDk8LgaAlAukWUwvIQKkRclIgYyO7MAa50S+IrA pesg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782454523; x=1783059323; 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=OhB1hdZH1RXfYnuHTRXF1+iHxT1kM5V0IWS9nNClVhA=; b=oUqY0qbRzWRKbopuSUmJXaJH8CJoLdUYwuuPzDao/pwczBITwK44kEQ9mT0FrTpEcP 9HmV/KUXD2G0/J4+0YeOsJCrUt+nqzlasBJf1uQwJLcd6eV7JigN+ynxz7/P2w0k+heA UwxkEHkWERMYGS79dxrloZS+gQm2bTWZ9GmjnXi8tmV6vD7cQtmmZ+U/bFP+c/EeAJea Y5NPY6kHfDNiUJUePmpwEAgkwgyp+auAKlcK8wnwVoNXYMPrWBn3OxnfviG/3u3JM+yi V3R0edpwuu41zltJqNdiAiuLduECVusCHNm7JPTW2Vv7N6GHONLxKNw/JuOl8t4tj+GV dU+g== X-Forwarded-Encrypted: i=1; AHgh+RpPqRhf1nWLO4RdB2wEpvPcfMgPATq8Y7qmrUJAs93+c3p/bFhjshfEQU+y+ccCJCeUzhwNsM6qWb7UvIQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0V10HWGryB/Zx/SrULqRHiUL4ZRB2df7WyYYP+RmMc3GgtLZt zb9gb1+TMp7aqNlNOdBwAWGEo1Xakivt64uAgjckCsXZb6mY8pTGjNix X-Gm-Gg: AfdE7cncOuf6cV2c8Vpy5Xk7PjGOWlzoQV5uHUTaaJN7moufcgaX58zh3Tvaugn0R0z 0phoufysrCP+0PksyHbJbbDhK1OvD0gbo4PG6AOiu1ru7ywCcnEDyDprCOTqoiFVBug6ePZqRLV XH1XCZFiZTu8SwYu7M5+C132qkPWsIUeJffdTjPiyXNFDihzEd/aSntNGaBFIzyy1zu3XfxA8du O2RzIM0xZ+6rt0HYlP07vdj6LqrZC/kZVOtvCzpPty1EwpJCper425H1xAZ1q3Z5unAe0XqL1lz UWDAn2Useo1h146uMgB1Tq3DpKchjO/Ae2n7BxDBW+ooNbh0hCcB5mBhbS2SiWFSeRy/LdwohqQ MiVFD+IO6X4UUBROwUwWf/FgsFcoA6CL8n1rXvDdxKCJAtVuc/H/xRaMANfqXwhfDpx6zB3daml /iHOZ/MUEGTikO6sJAXAwQ3KO6Z91ZyDBZClYbRDsHDrM1F16ZzOaKKmlkOQ== X-Received: by 2002:a17:90b:4ac2:b0:36b:8873:d96d with SMTP id 98e67ed59e1d1-37dfa1c3bb8mr5342482a91.11.1782454523127; Thu, 25 Jun 2026 23:15:23 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37e12da6ec4sm302051a91.2.2026.06.25.23.15.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2026 23:15:22 -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, 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 11/24] ASoC: codecs: cros_ec_codec: Use guard() for mutex locks Date: Fri, 26 Jun 2026 13:13:16 +0700 Message-ID: <20260626061329.23264-12-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260626061329.23264-1-phucduc.bui@gmail.com> References: <20260626061329.23264-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: 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