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 A2ECB495509 for ; Wed, 8 Jul 2026 14:19:43 +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=1783520385; cv=none; b=JWQRr0CxCrYoP8e6feiB+JL3rg3qriOSNnE7j1XBm/ULCKIaLdj55G6khJDJQDl+7gkEkU4ljJjQWDHdxJVdU7ai78AzK8q/U6yHjdfwWF5qjDR86tfUSoKRbuboYr87pG5WF+ot5pgEGddwHLzt68b3IGXLknlVYhWM8UcbkgY= 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.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="h85d1HS6" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-381ed661712so777127a91.2 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=lWyWbCd0iEgEwByw+PK5qSTE4XLedAfdmoW7k41CFRPtCr8tFpFcESPPsv0HTIQ+qo Q57bpuNhWvWn5lRhCK5n8DtQz7aG1u2I699s1pRq1popz4ODC/Gq8DCgfvejIMaF2Cjd ERK5MBQa1PmgtQlWHYF5/otnDGek9sHk1AcnOlC6QTmwFZxL3COw6RXZMtwcSaBRW7CJ b8ycNnxKcTC/GpnpXLBf/xmE6oaEyoXrUM0BbK7jSllMo2Olr1b794CYXUpRSA8mEIFa cTSIRW1x3RX1n6daJyjMy6g2MWGUQkm6vVzDyuVA+2024xiLpRKFImhb5CH3b0BUnDzt 8XCA== X-Forwarded-Encrypted: i=1; AHgh+RrXQFYzI1esWouQMDTG7WnrHdaCvgbMLORj4tqMVNAY24ic034tceNBssFq4qZtfOwgQ+1VHyuL+pXXJQ==@vger.kernel.org X-Gm-Message-State: AOJu0YzBSkYUgoZYXshC11FG6chz6zih5a6/BfnvT1crRlt09cJv6dUX fauyKKLI5hze66UHrlTTIbjciXnVl4ZCAZxlulNr1y6NNnRAYxkl26Nv X-Gm-Gg: AfdE7cmYlE2nSAuI29pvRrBH5W5+NuDGD4lL/2gPfd3/0HWbNDoJ5v+jiG4BTB2Eti5 yIi1v1kNq3B/wFOXn42Fv400IqPHNIgd4rofW4kTQpwN3GLiz8199dYpRD1nZjeLcmMrJGcCe94 2DyBEaEECBaeyAXU29M0A1PmBnN83037x8x0JlxR5usKrLLir/cz2cW4y+5NVTuDosifRLv4Voo qvc3G4MF6TOKi37vfUVdytNQh02YysUWlkPxzOX7t4o5iLLuyuL19yDMwGc2JAS5ZiWxAGlgust P4ivK0TPaxnbjXwb5YO43e++vW3zmVg2+m96UlqNZumculMMs/jKkJHAAjAGgiOr77rcmAruQ0r 3NslhGWgRTTWgHqCKn19fCk3S6o02TsWkxkece4cxBuf4YCH7mvEN4uzWq3F+4HhJ7T3AdCIXny HFDXL4NQFoYw+qa8tDv8CIwalUaK4+MO6AReUGk5DXex8vxa6cx2uzTuXJmg== 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-sound@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