From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 A4972384223 for ; Wed, 1 Jul 2026 04:13:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782879233; cv=none; b=JvuciBrd14/VdhdN100h75v7qXs5lFZaBdEIDDXrIsAp1PgSnF9HL4XJeuZg4XSA8ARAwuCMw4bzQrjnpHVwFz/aqACIfy/wHBPtbdpOHEBb1dR5JVGLL0qd5lO2PeWVHCfBxHjzNb3PpbJ9cR77d8RBfFX7j7vZbtahl+CvbwA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782879233; c=relaxed/simple; bh=QV6BN6yvpQFvt/+yWvIYu9Zcz8/chzu6n/KTStfQdIQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GidCd61EkLTw3oLyqwUS9etZ3TKRt+X5/FPvXrmgGUQNNGuqs0cG3gi++Hm+ElxrSpixIVINnfLl+GOg4OMvmWGuitKQdK0cwzD9Di9r+Uj9jSQji2/2gnCTOzZO87wUsV2olWvRuYsdudzdW2OFJ/14TrNmzQvxOTJ79ciTovM= 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=XiQ3izmd; arc=none smtp.client-ip=209.85.216.52 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="XiQ3izmd" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-37fad5eca09so959748a91.1 for ; Tue, 30 Jun 2026 21:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782879227; x=1783484027; 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=8ISxeHPMRNWAn38gbq9ABZr9k+q/G/Q7tNZCIdC3izg=; b=XiQ3izmdXKQdPTD6J3UF/95adBqw/OCWnSiYbHXA+38w5t1PCOHSf1aLYSC+5D9aEL QUo2ABcRQkwKlvGAULjfvNz1Ey9BFlHrKzQitZH5ASNYODhrcyaZsuesWzNFtOfq1y6S rsQ0u2Sx52lr9oQ+azZcuLE/4sO4dZBx7owYN33zRY39Q9s8MZWzNdRXC8gxMGnrKnps 5oYPyLVzN0cwslCpZGW6wxLUVh34KiO2cZ5pRHZL9EFd2yJaCN7XI2AcMdPQWSYqO/Uv 9SFgLztICNihqEetAEY6chdN3ilUs3RhOEo+x6MT9NGOcS4WfgVMi95gib5zBmaVjqbK tJ5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782879227; x=1783484027; 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=8ISxeHPMRNWAn38gbq9ABZr9k+q/G/Q7tNZCIdC3izg=; b=UvpRCTpAt4AvwuhQEJC/k6wJgK/6zWBftMpmtgRoVJ7BgG4X3wclgVZmAfYnQl8jZN VTHTv5PGBfS4BoMFlS5rr25NaApmPKy26T4lXM1Fy/lmigoVU+4Nx8RG9JbeErgpyzJk qYLsPULuK0AxtpJnbkS2wWTzaNSwsjgbNbEvKqk899JguygGpN4Z+5TTBC4Ao6vDjHzz OTFz1ls6WON/3DaYVIA8Kg5jbcbUxNP8bNNm6q93ABoCGBcxqXxd5RZz6YzkuR+1oG/P tLUvLJzwhA9WXgALBGPzAOnqFhwJDjjhlEcId7gox1sd7YnLsPO1RUGu12HHDbC6N2/g Otxw== X-Forwarded-Encrypted: i=1; AHgh+RqTB/c00f76vtUbhdyFQ8sjqqR1jtJnB4A5IiPiqhN4AQIoB5mELovcLUDQWW8OMjtK6YjHtIHWGxiWd2k=@vger.kernel.org X-Gm-Message-State: AOJu0YwE1WGcWLO2YcLiCNF7u0HSEr/MzQrIhBshRvRp+DrB7IQYzMgr cjGZ46ahzG+H1r3XvKihlUG/2BmjGG6JvvN3a3CNB6d2jAIOjOUutjVZ X-Gm-Gg: AfdE7cl2KQ/nKEgwBUoDVQdjV2LMwOKThhqePa63kDQDra99/iUHZ0IPxzL438M+NLh 30ebgh71PHL3SiFZCl4wPOyQthflFoTuqkgNKig8nt4zDlYk08s0TdWUcpf7XOfqimWispGepl3 AeuLrRMuB/mpiYPddHRsVmcutU4Bos/lsnbrzxw2Fx8lzMb/FaoUUOYZnLwPCA9k1Mm+cjrbDwF QmQyad31V4LPoFSRkfGrC4yuH4/bTLn0J8wThEDNwz3xnqkn6WMm8a0x4rLJQITIk6SnCMO+s0m kK11mFm8LkMaHUd7Zjr2pAmNeKwSEslM2UZQNjnTRnFXYK9RJlzJ9qwod9LRBVK6W61Nbyz5ZSa 7KscK89aVuonoTRLeUQZqR94nUxA2/JspCTlr3ayWl1iewLXnl3SDAUzvT6jHMl9etzylfRrWKe hKTXbq7R/xdHodv8jVl88K2e4NN8EP6bBGp3nPAxW6+JKczkc= X-Received: by 2002:a17:90b:5204:b0:37f:9e21:91d7 with SMTP id 98e67ed59e1d1-380aa1ffe6emr81423a91.14.1782879227070; Tue, 30 Jun 2026 21:13:47 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38095e830ddsm963128a91.13.2026.06.30.21.13.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2026 21:13:46 -0700 (PDT) From: phucduc.bui@gmail.com To: Sylwester Nawrocki , Liam Girdwood , Mark Brown , Jaroslav Kysela Cc: Takashi Iwai , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Sen Wang , Jarkko Nikula , bui duc phuc Subject: [PATCH 2/2] ASoC: ti: j721e-evm: Avoid mixing goto with guard() Date: Wed, 1 Jul 2026 11:13:10 +0700 Message-ID: <20260701041310.230725-3-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260701041310.230725-1-phucduc.bui@gmail.com> References: <20260701041310.230725-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 The previous guard(mutex) conversion mixed cleanup helpers with goto-based error handling, which is discouraged by the cleanup.h guidelines. Restore mutex_lock()/mutex_unlock() instead. Fixes: 6f4cf77320ae ("ASoC: ti: j721e-evm: Use guard() for mutex locks") Signed-off-by: bui duc phuc --- sound/soc/ti/j721e-evm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/ti/j721e-evm.c b/sound/soc/ti/j721e-evm.c index c214ae0d7b95..312298e0b004 100644 --- a/sound/soc/ti/j721e-evm.c +++ b/sound/soc/ti/j721e-evm.c @@ -4,6 +4,7 @@ * Author: Peter Ujfalusi */ +#include #include #include #include @@ -263,7 +264,7 @@ static int j721e_audio_startup(struct snd_pcm_substream *substream) int ret = 0; int i; - guard(mutex)(&priv->mutex); + mutex_lock(&priv->mutex); domain->active++; @@ -303,6 +304,7 @@ static int j721e_audio_startup(struct snd_pcm_substream *substream) out: if (ret) domain->active--; + mutex_unlock(&priv->mutex); return ret; } -- 2.43.0