From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 279DF3E6385 for ; Tue, 30 Jun 2026 06:35:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801349; cv=none; b=H6xBjcu7L4UfFSiFcg/B9VfptpfL1TvvZVECoqAP9S+bJSOkoKv8F42qQCfjzIF1nKZFUhhdxTgcV19DuqszkklOkG56qwI1hBn46L0RU3i7IiJdnZhw9zfWSShvqul4xynYi/vGNUHK9Ly24VO6Ofwd/VyNSB4NM42tUw45sOE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801349; c=relaxed/simple; bh=fTei+vUEtZNmVemds32xGB8uary3SUfKARXY0HPVp94=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pprvcURf62PWoM494162msremdw9oqRFHBfKPVzmuhlM5gHPJjmyqyzFHZhjd6hO17pSepXg75YP97lbweYiSUrz8RFLoj5WFPZVAp79bcl3/bON8hk/82jOPAWpvVLlOR5/GmVzwsaOk6hX795U8hTAjSYksmWNaoVf09J6xdw= 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=FDi6GPhN; arc=none smtp.client-ip=209.85.210.180 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="FDi6GPhN" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-846970f0acaso1588206b3a.3 for ; Mon, 29 Jun 2026 23:35:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801345; x=1783406145; 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=SaBgmvHyCdtOOzTM9Q4PIyXVQ3lhLlNUjuQP2hIqGR0=; b=FDi6GPhN+2bto5YvAJvdy8oubusuCrk3xnMmCyh4uxEpjsixGpccJC8MeDbC1MEnNx HqnvLeLxjL1xOBTh9vhgacGlkpYSilamQE/KYapFca7dHByVh/r8s+PiKtFlbdE8VEXd 7sRW1WONAZ0iXN/eu4cmO2CZ6fSPDqqRj9c9FRgxEh5pub/EkTg+CN6qPrava7xxd7fK FptGZ7PIVLMDUhbrO/rKx5KlPRUUzvX36cCs1zIMFl7RgeUkDc6KVIauRFqdCgU+6jPz AmNAxjMHsao42G0FF6B1fYH3Tl5LZ6OQSGVV9Pu2G2wN/T8qqOHZQay9H5CyjYGU0jrr gWWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801345; x=1783406145; 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=SaBgmvHyCdtOOzTM9Q4PIyXVQ3lhLlNUjuQP2hIqGR0=; b=JQLEp7UqxCFn1uD7JK8jD+iLW3ACPyli4xx4g+Vzo/haSSQ+0w9/Tnczy5RlT955hT MiQKxX1zQaN1DkDoNYiG+QvgrcCSkl9Ls4p1xsd7Zfvp2y+2eClT/bS+M//cOD6TN26R 1FeYajuu3eZyJhQxDlbyU9uKSWeMfiYNZ8TFZHLZTJTH53Sez2fXxhtyeb0PPbmYAELb 9EY1HZLlYi2QuAXv9Md+Vd/8MMOCCI8HNMyNy4NjCBLeVpKiw4UBi/qx7plHK7C6CfSS LEtxElwOj78nnHuSStDiKKnrKgkNgubSAs4h1/icILg7a6wluHfxe2EHCZOTaHH6njK5 66LQ== X-Forwarded-Encrypted: i=1; AHgh+Rr6gnKpej8OmRKVIjRP5pCk9uX6OeBMZCC5VxqX0M7RUkpiHtfGN02anAKfLxV/LB3qi8jAMnHKkhZKdtQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxqliD3ZqDU3DGAiRlWMO0yTLNpZjldTjyDhuziPJfgThbmaRij jHiwbOfkRTEudReRE0MlQ2zXRmWnpwW2KD3YDIqnvaatnkfFubBvkEop X-Gm-Gg: AfdE7clI8o+5MXvj/nFzBcX1QR+5jSRoVlgdk+BsjBlJ/Iepe1B9QhMT68dmkXW4LCc CzmyEzfICQe8BXnkQDU41VexLYEDek1gYRIIsWAj/q8lUMSSPj6ADylkrA23TDSSnXeL5v4v/i5 QI6GDrU/zMAsJ51hOJ2AsF7OP/1TDHUef0D2ULCu4BtQO5nYiivyarvgu+oYW3tFKIQvDlnMxkF tdt5SV5RsfSNr0xICsMUhguVNPgzhARSCvM9T6Erp6v62wMM3z9aaFxt7qFDOqcZbHdnKBUiuBl 4gHx+L6lJW2nM92XflI33sn3NuZqOaKVEIWPfa4b4q6bGwgvmsb/QlbvFL0SIjL/570oJeQAoIK Pjzf7U4vWuNTfbW821VWjXWPEv0kfBN4O775xIFe6RsugCbtMpAiWlLERlwUvU+7E2/kXnCy1AD PJ+y22Y9jtfkXfh5/yRtcX9vO3b5PlVTwPQ7BAvTDJblU1o7s= X-Received: by 2002:a05:6a00:3e12:b0:845:e873:4248 with SMTP id d2e1a72fcca58-8479f3fa66emr1886818b3a.56.1782801344986; Mon, 29 Jun 2026 23:35:44 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a02cd237sm1165061b3a.32.2026.06.29.23.35.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:35:44 -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 05/27] ASoC: codecs: es9356: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:27 +0700 Message-ID: <20260630063449.503996-6-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260630063449.503996-1-phucduc.bui@gmail.com> References: <20260630063449.503996-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