From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f171.google.com (mail-dy1-f171.google.com [74.125.82.171]) (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 773EE47887F for ; Wed, 17 Jun 2026 10:37:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692654; cv=none; b=VRtMNmPLJCtv9HMMD3ddeV5iTXTfSvUvHQl4jr5D5SQKrugwle6oyv95+YP57jqVcoKneD4lteuW/LHJ/5Mx3osg7FZkee877lBeepTsF1HVeNX+ArH6/KLXIKGtsBMmcFca5KidedTYM0aCSvOFYzqMMNk1mDz9WQox+SBSuAU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692654; c=relaxed/simple; bh=yMC2x0vx3J0iXo0ls0Nysns2s/4zDPY2og/b5u+3KjE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AZb6D9wfoh5ZaQoskbx1ckzEzjZFDNqvGTX3Jb415xZqhJgineyvWSOG9ebyqZtpfhheWldrokIx7G9F2vrLqb9BFXO1vyATpj5bylFPVhz8Om/XS5EqKogZAciIgp7PJnCCLyG0kSl7JNi4fGANss0xwjzJ4/rzz0erqjqbSyE= 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=aP3JmSrh; arc=none smtp.client-ip=74.125.82.171 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="aP3JmSrh" Received: by mail-dy1-f171.google.com with SMTP id 5a478bee46e88-30bb7d20ad9so2337423eec.1 for ; Wed, 17 Jun 2026 03:37:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692646; x=1782297446; 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=7eMqE3BBUM7YLjw0Y2Au39yLx+nag/ZXvLG1ZHdqVe8=; b=aP3JmSrh3ecpivpRdrnwAPRgFheRUhfHgbkx8yagzphLyndwN4e3V04eCFRf8dFq8H RPtg4oK/omnE28GTqpz2rwXXlYs1kVa4Y9Uhrdyh5o9rdDhsC4g1AMocK0aNHkpLU3W4 Io8+dVqP2pMFBQy/0Ms7GNBroCynaAP+0IwoeJpZ9xqKYx0ZfbgJ7/GrqouUdS3q+udh dU3gpvtFFuq3LRUIQi6gYtoeqVpJWCCZ+zCekPs8j772Bq/RRlYcPvQao1YvkqZgjfl3 5lQMXIgK+uxsVL0XsXPUJg7lx5eNzV2frEe6j1BwmR1nja6Y92ueaUjhefTgojW96g7l C24A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692646; x=1782297446; 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=7eMqE3BBUM7YLjw0Y2Au39yLx+nag/ZXvLG1ZHdqVe8=; b=gHPyCjKZ78EA1kdhg+x6jDWdoDUqFJ9znecwv9z7u97QF7xxIyaZBiPoL9r7IlB7NE aIWCrisJphhsj9EztoWyTDqSzmltu0+Q9VDb/p7Ep9l44aZOT1yKd8CIUGvjujo25K7a 4+ijBBQEJleROGlkqdmr5BGm0ovE4EmbsW1OZVbEWd7kcHaEc/m6xAINpkUcQcURz/vn fIdPcEtOpFjRdWXx+ZbF8KI0NiA38aV38iUz/r14Qx0BPbYsSPjxwgbWijxJQsq82cVT 2H9Rigpm875znd6Ip3GjnEXVg5GaXtvsSxyCvWCi/FJJ1m+hrpe+oOVNx2zf1H38hUV6 mQWA== X-Forwarded-Encrypted: i=1; AFNElJ/A0Ews4ttdmtRPtY06tFmckdBPZN3JamPn2qUrWn06JQSHCRPNtAIKFjG0ipIh2c0u3+e6j1CvCKXCEIQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzsbGFtKbH6JDcOzU10ZwkCBVQPqolmg19wGyk6PyeJX38N93vs uOtRsgLgkdk/yX1y7bYeUUxDPgQsCxjOfLXYwsFFGeNdK3U2A2zDd39E X-Gm-Gg: AfdE7clH4EtM/S+Fvau10hqpqM1JsiFEsPmfCZdvOKQ3rIiucT+X3r0RHAIbR40bI4b CFLc3ngJlAmDnnw/8bFQ4Tkrg3x1S1ABljOjBtqHfoFBaw8perKYrxWrVWVrc2LYpXGTjvlH7Um AvQdnl5i4V9ajXzi55s8ViqziQDFeML9VCIaqfZgqL76s7aBcMkasZnnjUe8v/Bb1a1cA4ULPdE 1kR4yZCmxAdQRNtK5zjmYb9obtyl6qOKYHqbwve/CxtmPs0lrbKZ+puBflk/QDLSSNBj6UtSRd5 wizzZHUxJuw8uC9nYlJ42YPJLYqoCsFJMClmoeuuwlbxiDb9wxcY0FvIbQbkgsYDKjy+m5/xUeW 24/glvQoYmKWmzjNCmo0Im04VbKTaJdpL811DhGJKcs3EmYSEKuqd0/PLaTmY766Lf2XkuQRH8p siWvMtAIG6+ThMPQ7droMy2Ks65RgzfzPPhcgkQIGrdcesdAc= X-Received: by 2002:a05:7300:5b95:b0:304:ed85:5f43 with SMTP id 5a478bee46e88-30bca068312mr1553091eec.24.1781692646184; Wed, 17 Jun 2026 03:37:26 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d0828sm24616275eec.10.2026.06.17.03.37.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:37:25 -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 29/78] ASoC: codecs: es9356: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:31:46 +0700 Message-ID: <20260617103235.449609-30-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-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, 13 insertions(+), 16 deletions(-) diff --git a/sound/soc/codecs/es9356.c b/sound/soc/codecs/es9356.c index 670e918b56a4..1915cce09809 100644 --- a/sound/soc/codecs/es9356.c +++ b/sound/soc/codecs/es9356.c @@ -501,16 +501,16 @@ 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, @@ -929,7 +929,7 @@ static int es9356_sdw_interrupt_callback(struct sdw_slave *slave, int count = 0, retry = 3; int ret, stat, reg; - mutex_lock(&es9356->disable_irq_lock); + guard(mutex)(&es9356->disable_irq_lock); ret = sdw_read_no_pm(es9356->slave, SDW_SCP_SDCA_INT1); if (ret < 0) @@ -982,11 +982,9 @@ static int es9356_sdw_interrupt_callback(struct sdw_slave *slave, mod_delayed_work(system_power_efficient_wq, &es9356->interrupt_handle_work, msecs_to_jiffies(280)); - mutex_unlock(&es9356->disable_irq_lock); return 0; io_error: - mutex_unlock(&es9356->disable_irq_lock); pr_err_ratelimited("IO error in %s, ret %d\n", __func__, ret); return ret; } @@ -1092,9 +1090,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