From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f170.google.com (mail-dy1-f170.google.com [74.125.82.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 E456A40BCD9 for ; Wed, 17 Jun 2026 10:34:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692486; cv=none; b=A7TnsqiHDDwoXTnL7H2U5U6edEhUda0J8bA4ipFpOtYLrqCyojYRZlWQfa6ChXyfcR037/x62H9xg90XS+4hPcnSHrRNAkgQqgrujtX2Tv6d/6NF5mWjy2DrYQi/OCmQKkGCaJ0P2PjGwNEbiZEuxELnEYvNcwY123UYXlga3kQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692486; c=relaxed/simple; bh=uNHjTev2hmfXRNq+0ljawWlrrdZPdtmV526ovzJ70zs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=utbUYpu8aWtG4d3gXfja0A2xgpSmEKtDn6U/CyapAz6mTjg5sk/8vHo+JYPlbPZjXsqsRsN2HTJJPerHFxaIyms/Pa1ULtoA0tApnrqKDg1PBBR5LEqzh6AosEC35N3zsTnqfVdKa62D5IqI/izWezmtQEPctemVZ43vkbcHpK4= 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=gC5dQtKc; arc=none smtp.client-ip=74.125.82.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="gC5dQtKc" Received: by mail-dy1-f170.google.com with SMTP id 5a478bee46e88-307d0405e07so8456631eec.1 for ; Wed, 17 Jun 2026 03:34:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692482; x=1782297282; 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=6R22m/pLPBKiTabqFMhVFBn5ZxuG7/U6c6Q8dEuLYd8=; b=gC5dQtKcFYiedc6//kN5l6JjET7BMhWoBFeLiNkmmDi4Myn3zPBKxW3+WqgiaoKrNP iBDgt0GvEGjkK/UF+ypPTFBsdDEbNt8EOEK7duJPWtvQfXAtglXtn/7TAurS2ZAwS2d5 hyKrlS6RTTcLC2LiJjOCq3CZw53hS0TxSBz0CJmriYkcDiwC+bTxD2JvSwtO5Wop7MyH 1y/A0R6UXmsMyNIPjezEztYcVRKB6CNaVa7AeedTgMVAvFQ4pJd8GO24Mg0eFAqCMd2l 1HrsA9CQLAh1z9fy31fvDarpG+UV6Kd/9/leAe8JiKGTApNng1ayLi9re40DnAgc93Qk X3hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692482; x=1782297282; 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=6R22m/pLPBKiTabqFMhVFBn5ZxuG7/U6c6Q8dEuLYd8=; b=eZRtdK/WThmtQEQfZXQC9QAD6vHLrh8OgCWCrL44aeFsc9AH69RpRzCSZv6xVxa/S+ 5nhCpPdscMXZaeDRDv2WWA57CzVKFMZ0sKYwXExnfuptyNBnxUNCoxTOY9fmMPJkl1/A LIRlfkRBTyENy1u/voDNv7AEeH8+kemMKN6aRewmNvMWiqfbnvvlGxt2cZ3EiOtQXuIV mcsn4zy/q4e0c4889oIxT8U86xlXVJ/bV+2zRdxkCG49UqkXzovH4+/mY/JWiHBQgEnH I42khJn1nTciTBIPgWeSOdTBUtM0ciylwv2AFd1NACZbIjIEMUuy5tXOznW7Jx7x4dSX jnHA== X-Forwarded-Encrypted: i=1; AFNElJ/32JZ9teYk7oCyQRB78VsBiVWeeZMaxE/NpoitA1TkI/szycZFychAnb/cJxSA7ku0P1HNIStrmMqWW9O+@vger.kernel.org X-Gm-Message-State: AOJu0Yx7LEzXlMG8X9h721WEaTXd+/MdtFPdchBWrIn+vHKCgEC3MkwZ mqrQtnbPg4LF1TG8xmkPuZS8typ0SYw8JJITd6smCy/T5Nx3miDk89U0 X-Gm-Gg: AfdE7ckgggi6D5LKqbAjcyrPd5ZJ0pkBKBSf4Gbe8AR2F6c4+H/5i1HM6od10pHV0E5 IF5JmWH/8JfaLBX2Kii81z2vtUeL4TRbREWBp8+DdAuQz5WbtSV29VqJhOfXeP6lUC87VFINfFu SxMRgDmHr0U3lUyQ8EVmmWuJbuhO0oQX0pDqgzLt6/4Dpmw9Y67UUx/kuVGKm6R/leljaBfRy1C QGY4NXCSi/THMkDuto50ECPntWaR7IOQmmAQUnDxeM1uikWyjUyDh+ZtOukkczraoVFSdUoj+y6 e6BJZooC5ZBbZGAIu/P9nN5/4uG1D4gko30Ig2cPV+RWBeB9+3ikHd0b6sE+UjDSowrgJh4OyBc z7lP/EYBjUc5OM6jRhBGKZ57oeg5PF5+Pt/SIl/idh3Wy/RQTr0w5pVpbtcdk5aLscaroYqY1pa B+tSalIe4BXjD0+n2KQkfh5uBj30RljbGUvCN/QPP0nMEk8VU= X-Received: by 2002:a05:7300:6d15:b0:2ed:b131:240e with SMTP id 5a478bee46e88-30bca0dabccmr1625180eec.23.1781692481713; Wed, 17 Jun 2026 03:34:41 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d0828sm24616275eec.10.2026.06.17.03.34.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:34:41 -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 11/78] ASoC: codecs: cros_ec_codec: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:31:28 +0700 Message-ID: <20260617103235.449609-12-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-arm-msm@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/cros_ec_codec.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/cros_ec_codec.c b/sound/soc/codecs/cros_ec_codec.c index 7dc5a7c3ca96..c522bacf06de 100644 --- a/sound/soc/codecs/cros_ec_codec.c +++ b/sound/soc/codecs/cros_ec_codec.c @@ -608,10 +608,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 +624,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 +893,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 +908,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