From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 A2E2548034C for ; Wed, 8 Jul 2026 14:19:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520385; cv=none; b=rUEkzyo4ZiGI4hDXTAIrrmHo/HRN4y5Ezb4b4q47hhmX8K/qS5O3LzpryzqW7fCJi53iyO56DN4e+TlfUMPAYZOn6QQVLqQDBysQ8kpmPrWq4CbuaiKRBWu7dx2GNsmo45VxflWdwR9XWmO3aQdc1pf0oRhak2YksDrrbyttPdc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520385; c=relaxed/simple; bh=fTei+vUEtZNmVemds32xGB8uary3SUfKARXY0HPVp94=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YryfHnM8CIA+ky049UQf0ma0fYZebIpHDogvx9Q9wgPev4HNvcI3/J0SUxynyKBrz5RWLap4hgMF3NinNvZcKvR/WGDGowPgXttGNOqedDbOZmrsPGio6C93Ll4KB3RoatLPBI/UKuyjZUMR6DDDX++bHxQ5qT7wrAlv02nfWrU= 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=h85d1HS6; arc=none smtp.client-ip=209.85.216.54 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="h85d1HS6" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-3810c5d691bso608862a91.1 for ; Wed, 08 Jul 2026 07:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783520383; x=1784125183; 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=SaBgmvHyCdtOOzTM9Q4PIyXVQ3lhLlNUjuQP2hIqGR0=; b=h85d1HS6eTiscLz0RgtX14dpzfPknjf2KPyty81MarPRrMJIf3gGGdHF8z6HPA7t/N cLAQbVxz0tTZIK4034YanajWNFj3hGU+pFfyq33Ldp6keOq6cj/tPFh2HyAyLxjhdi15 5wBzmCHwaTlKCiB4IOQheDdb6aGLlAMp3GLE0pMvWUqTZaTXxq7OKrs7B5HjfNXsZwzR DTaJnUfgzLmOuvo9IWsifiUt/u/R+w68Qw8dxS5rBGTGO1eT2qWrZNbwo8B/47wbNtKS +H90sq1owdd2uT2mwmdjIm5Bhcp0uXF7pXt3kmI2lMjsl8cSaQ5hDAlStLHjL6ZSEa9Q GhSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783520383; x=1784125183; 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=SaBgmvHyCdtOOzTM9Q4PIyXVQ3lhLlNUjuQP2hIqGR0=; b=AGfUmuOvCkeKXcvzPD0ObBAHQSxL1sJZiKBxJ73cj9fxlgT8TPFgeoKiOHmpJaatew astztX74xDZ5yrO6TcUN8OVRlU4GMn1nzDZuBgYgvJvdHPhobCXALpbK9K/Ofq8UE6WL 2Gf1xm9sra+SEnUhqIQtoFQuzB+iiwsE++2hYay+HCSi7sxHzYwY4XonuTKXHTAMVwAK xJJtUZE6V+CsbUYYXg+zM9X4cqmkUPv2CwY0owUbBq1NpkMd2gSb5I3B43QViAhSLKdW rghrIZQWBaQXdif1pdJfRTTgM1prmnLFPr8b7VX5B6hCZPrgEnU1W2YeZGRWwAPG3as5 Fv6w== X-Forwarded-Encrypted: i=1; AHgh+Rq7CRRXcO1YoZBUkBpMCv0WFUXF1A7MTWdt0/+dg9DczEyDhUitD+gJStE0nqhrKnDW6ff5dr5qvXfumoI=@vger.kernel.org X-Gm-Message-State: AOJu0YxJifpY2Fe6Kckb/m+irM5hjXrbe8e4bvdgBbgoPdsj3hWtCaHh AeoYZc7T5NLh33Nt7bEVVtKzJXFp0DSPECfB7AU1Xok1uvVHu1fZi9w1 X-Gm-Gg: AfdE7cngUr4PUrWT2LKZHQyOK1DxkdXAaGWEEIS/sIRWmlsaMu/XCu9x1pRAb6rw6dh YJfcc4Pd9hRSBoPijW8jZV0k/BjD/UdufxjtVY2HPu2P+HHmaCxv2w1GWozJbYRHdKk4zdnloaJ 9bK0kjD3fqqzu+QR3TRu01ZJaN9Wqgp15uPGlmSJRpSRQcCxfg8uV+T/+7stFfYoNCo3Tmy/4/m TcLZTa4jFwcMRv3HI+1PDpcm9jmUjDzd34EPuXyIXKZWRkeQ69PyLHyYc9daG6BXM9by9taUk5x JJ2LYpNxBsIUeDwy8kx+cFSq3IJQTMsxaf2453QKeSLFM036eTPLWJZvAwnxecnyMJeiLGGMHoL 14HXUMgrIwNoMX2h72tRZSRY9/7iMwIA5rGyRy/6MqnpcroCE+7W4sC47mHOuRTq2F+OBrNfbPw MD5R7DOlKpoe6NGCv+OhZQst0lj/sqm3XorwMGhz5nFjaNcm6E+xKdGdNw6g== X-Received: by 2002:a17:90b:57ee:b0:380:a5a9:7586 with SMTP id 98e67ed59e1d1-3893f693819mr3074655a91.6.1783520382800; Wed, 08 Jul 2026 07:19:42 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d3bcc0sm28841575ad.67.2026.07.08.07.19.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 07:19:42 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Takashi Iwai , Nick Li , Herve Codina Cc: Support Opensource , Liam Girdwood , Jaroslav Kysela , Srinivas Kandagatla , Charles Keepax , Richard Fitzgerald , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Linus Walleij , Kuninori Morimoto , u.kleine-koenig@baylibre.com, Zhang Yi , Marco Crivellari , Kees Cook , HyeongJun An , Arnd Bergmann , Qianfeng Rong , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bui duc phuc Subject: [PATCH v2 05/27] ASoC: codecs: es9356: Use guard() for mutex locks Date: Wed, 8 Jul 2026 21:17:12 +0700 Message-ID: <20260708141734.578926-6-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260708141734.578926-1-phucduc.bui@gmail.com> References: <20260708141734.578926-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. Signed-off-by: bui duc phuc --- sound/soc/codecs/es9356.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/es9356.c b/sound/soc/codecs/es9356.c index 8db81d574624..8ef9e70a9316 100644 --- a/sound/soc/codecs/es9356.c +++ b/sound/soc/codecs/es9356.c @@ -7,6 +7,7 @@ // #include +#include #include #include #include @@ -501,16 +502,19 @@ static int es9356_power_state(struct snd_soc_dai *dai, unsigned char ps, unsigne } /* power state changes are not independent across functions */ - mutex_lock(&es9356->pde_lock); - ret = es9356_pde_transition_delay(es9356, func, pde_entity, ps?ps0:ps3); - if (ret) { - regmap_write(es9356->regmap, - SDW_SDCA_CTL(func, pde_entity, ES9356_SDCA_CTL_REQ_POWER_STATE, 0), ps?ps3:ps0); - es9356_pde_transition_delay(es9356, func, pde_entity, ps?ps3:ps0); - } else - dev_dbg(component->dev, "%s PDE is already %d\n", __func__, ps?ps0:ps3); - - mutex_unlock(&es9356->pde_lock); + scoped_guard(mutex, &es9356->pde_lock) { + ret = es9356_pde_transition_delay(es9356, func, pde_entity, ps ? ps0 : ps3); + if (ret) { + regmap_write(es9356->regmap, + SDW_SDCA_CTL(func, pde_entity, + ES9356_SDCA_CTL_REQ_POWER_STATE, 0), + ps ? ps3 : ps0); + es9356_pde_transition_delay(es9356, func, pde_entity, ps ? ps3 : ps0); + } else { + dev_dbg(component->dev, "%s PDE is already %d\n", __func__, + ps ? ps0 : ps3); + } + } if (rate) regmap_write(es9356->regmap, @@ -1092,9 +1096,8 @@ static int es9356_sdca_dev_system_suspend(struct device *dev) { struct es9356_sdw_priv *es9356 = dev_get_drvdata(dev); - mutex_lock(&es9356->disable_irq_lock); - es9356->disable_irq = true; - mutex_unlock(&es9356->disable_irq_lock); + scoped_guard(mutex, &es9356->disable_irq_lock) + es9356->disable_irq = true; return es9356_sdca_dev_suspend(dev); } -- 2.43.0