From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) (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 4D7573F7A9A for ; Mon, 27 Jul 2026 09:45:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145524; cv=none; b=nwC8lwqLpHacZ5jA8Viykdw7DEWf8x5BdJDnS5wR2+er7nBrNlp7hShQLaL+cqggu1jVGDc2zvRg0h68Ilj4xubN/nyQjdeHoMWMPiHBCeJAqjF7v831Wvx0RkGKYk4yfFCDIvBCsNslZFFxEygY9z+ml94o+q0KCR51N7OYdmI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145524; c=relaxed/simple; bh=chor1/9GogowF9EJgZy2hFJZE1uubwSj8Yvkq6IYPwU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oJaW7A1IXQfHCFhsB73jfDjbDsC0PPfljGFbSwWELdtRq0tzjLFiMd2mOBC2/z8hkE3FxSD288BGaaFGCkLoT6UfnKn8JR3NA52rrP3mLbto9Usu0n03l4x3N862ndqZnm/gJaOJ2fJoXEw+cvFAV4YJ/eX9pR4vXAl+trl/JTs= 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=WCL9E72c; arc=none smtp.client-ip=209.85.215.174 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="WCL9E72c" Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-c9e30214d8fso1904099a12.3 for ; Mon, 27 Jul 2026 02:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785145523; x=1785750323; 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=lljKBSDJsjI6QypuaswVsYuIZiZ2Rt7j69Hl6k2jRSY=; b=WCL9E72cAQsIRNjlwUlJIEP9X1S6xFcHpli4ftCIUr0WsrcAc8EmvQeFOeotlqDDBK vshNWHBRQSGQHfiT318wOdodjByrg2T9+CzJDYjWhJK+9HGlkTcprcO2AfsETkVV0xpN +BJeU0zcQbKKyaQe5JaSfY5Z7waWEpIcUyc8FrEI3yF/sMpG/a2O8cq7LEJP0NHU/W4+ tbJLWQzPeYdi0X19AfBEGrflqpss7l/VNxSbZ6kqcv7d5wj72M6yD3AoclE3JjL2soJZ 4IDn8eS+ZFXKq/w+CB/rzKjkrwEmadyB3qvMnZPAGop5m5SXzaWW6asYOQJRFOIjmruH jyzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785145523; x=1785750323; 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=lljKBSDJsjI6QypuaswVsYuIZiZ2Rt7j69Hl6k2jRSY=; b=HmaEa9gcwYrhGMFFUBMNYdamLst01ued+nLKGJue8RKXplYUWRFDxicYHExqS6QYgj CPvzh8ulvwUwsx7AhyLVHmGrgqlMUNVW5EJZhR5AkKQanHZFp1rbnsGTvP4LF7FNAgdi VERX1SUKxLS9kdNCeYPzSQ7Oz9UbTNz3s/Aa+ZZu9Seeq+lUJAUlCJxM1rIxHIuu59pM djgzS+rKTcA+yco36eDPOWoyRjdp3QK6m1F4pmsXouBG6apG8kFI6s9OyhJqkiVP33A9 RDqnVCXzYvGViPqx5qY/Rvbt+i+mtI3taVoj9GjG/mYBKxN9w03j63O9XAk3cq4afVc3 MHyw== X-Forwarded-Encrypted: i=1; AHgh+Rq9/ukiPFRuHdP0dPybx1N7qdsXTJOT2yb7v7qYzxNYRjmaVV6mpE/H/uWPRXCxDSfhM7+y7KqNbt1TruGH@vger.kernel.org X-Gm-Message-State: AOJu0YwIP6MmtwF85QemfFsTafy0XIM5K+ZkF6nVjmAWW21lq7WzoYCM cD4rsquWnw3tl+mJM5jgUpMrF9LvGjbJ193l7lvSmogQcdGU9rJwsAEY X-Gm-Gg: AR+sD12p3R81geMQ4JIrGT4ktvR7ghrQOH0Cf7xJoBDxOtQz7flVWci44xepBrtlTEp +U0D4fOsn/IMK6jqumtB4TbdwDW6yBZakbc7bP70NCUtIgI03Ls7QzdTVP7Fiqhfdyj7tp+lGMf R/hHWJX3c0GrrXhZah9B1H5cwRCypRg5UqRe51kjNKfcFIi7S1IcKWvGaZz3AXaaWKcLVuSE8NU msFw4PqhdwSaVhZK2COs/2YMmRC6DZcjN51oXEnvw9LXD3RT9nFnnvkLQ7AiQTR1TKxMJDEd4uP obvSXbCzwA5zipL7UoA8rkmqY15cmRkDA0LggmJAz99l6W77aOADfut5xdA6pC4QShaTl+f71jj JNXXxvSirLEcrIIx/a8D3+YvyGEiUwAeuWi71adrcl5zPAh9n8aVxiafPFghfEroMUVvdnFwkdd BxzrDBjUcRJJMbU3sQAaAR+qXqwEolTcETJmNuYXuf6eY9MmoH1gDJT2VfOMgsIM70cy4PJFXzl e/3/vguzYtVrV+KIEUMlQ== X-Received: by 2002:a05:6a21:6b05:b0:3c3:96a8:6878 with SMTP id adf61e73a8af0-3c67df06402mr7686162637.47.1785145522508; Mon, 27 Jul 2026 02:45:22 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbbb66b5ffesm2959018a12.19.2026.07.27.02.45.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 02:45:22 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , nuno.sa@analog.com, Shenghao Ding , Kevin Lu Cc: Baojun Xu , Sen Wang , Steven Eckhoff , Srinivas Kandagatla , Kuninori Morimoto , Charles Keepax , Linus Walleij , u.kleine-koenig@baylibre.com, Thorsten Blum , Kees Cook , Chen Ni , Bartosz Golaszewski , Shengjiu Wang , Sebastian Krzyszkowiak , Pengpeng Hou , Richard Fitzgerald , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, bui duc phuc Subject: [PATCH v2 26/26] ASoC: codecs: wsa88xx: Use guard() for mutex locks Date: Mon, 27 Jul 2026 16:40:46 +0700 Message-ID: <20260727094046.23001-27-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260727094046.23001-1-phucduc.bui@gmail.com> References: <20260727094046.23001-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@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/wsa883x.c | 11 +++++------ sound/soc/codecs/wsa884x.c | 10 ++++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/wsa883x.c b/sound/soc/codecs/wsa883x.c index 24a5904d8e6c..442cf9f3eaac 100644 --- a/sound/soc/codecs/wsa883x.c +++ b/sound/soc/codecs/wsa883x.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include @@ -1237,9 +1238,8 @@ static int wsa883x_spkr_event(struct snd_soc_dapm_widget *w, switch (event) { case SND_SOC_DAPM_POST_PMU: - mutex_lock(&wsa883x->sp_lock); - wsa883x->pa_on = true; - mutex_unlock(&wsa883x->sp_lock); + scoped_guard(mutex, &wsa883x->sp_lock) + wsa883x->pa_on = true; switch (wsa883x->dev_mode) { case RECEIVER: @@ -1290,9 +1290,8 @@ static int wsa883x_spkr_event(struct snd_soc_dapm_widget *w, WSA883X_GLOBAL_PA_EN_MASK, 0); snd_soc_component_write_field(component, WSA883X_PDM_WD_CTL, WSA883X_PDM_EN_MASK, 0); - mutex_lock(&wsa883x->sp_lock); - wsa883x->pa_on = false; - mutex_unlock(&wsa883x->sp_lock); + scoped_guard(mutex, &wsa883x->sp_lock) + wsa883x->pa_on = false; break; } return 0; diff --git a/sound/soc/codecs/wsa884x.c b/sound/soc/codecs/wsa884x.c index 567861dd42ad..a367c94bfb4d 100644 --- a/sound/soc/codecs/wsa884x.c +++ b/sound/soc/codecs/wsa884x.c @@ -1701,9 +1701,8 @@ static int wsa884x_spkr_event(struct snd_soc_dapm_widget *w, switch (event) { case SND_SOC_DAPM_POST_PMU: - mutex_lock(&wsa884x->sp_lock); - wsa884x->pa_on = true; - mutex_unlock(&wsa884x->sp_lock); + scoped_guard(mutex, &wsa884x->sp_lock) + wsa884x->pa_on = true; wsa884x_spkr_post_pmu(component, wsa884x); @@ -1717,9 +1716,8 @@ static int wsa884x_spkr_event(struct snd_soc_dapm_widget *w, WSA884X_PDM_WD_CTL_PDM_WD_EN_MASK, 0x0); - mutex_lock(&wsa884x->sp_lock); - wsa884x->pa_on = false; - mutex_unlock(&wsa884x->sp_lock); + scoped_guard(mutex, &wsa884x->sp_lock) + wsa884x->pa_on = false; break; } -- 2.43.0