From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 59FCA3B4E98 for ; Thu, 23 Jul 2026 04:57:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782631; cv=none; b=fOCpmCQskp9wulQOdB5pnEAMSy2L8eU8LxzkTi3sw1Lp+UtuBqZAFGDKgJbXjVyNdwvRbGE9sU87WiFwmUWxtoBeYAAgym/JeJRm/AsTZcog8WsO4AyGAfjTt/mWhV9ggOnjFYFnnrBFSNFw8iHfcMfZLXR04FNeu8QbKJltYXk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782631; c=relaxed/simple; bh=chor1/9GogowF9EJgZy2hFJZE1uubwSj8Yvkq6IYPwU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qtM1H3RbNAzkgfFYGRDsaL0FKO2qNnyVbhmqEhXcglaukgqWRJT6QaaDkqgzwziz1C4ecuTonj+k5/BdPV25DeJ3Be+6hDYOJmvqTbpWA1F3HKOi2SDaG4igBligv4MKN5Ih4uOid3wMe1nGTdrLRFdvD+pTaPfHaotbq2i0MUc= 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=pIsyuLNs; arc=none smtp.client-ip=209.85.214.172 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="pIsyuLNs" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2ceb096e675so2732635ad.0 for ; Wed, 22 Jul 2026 21:57:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782619; x=1785387419; 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=pIsyuLNsvCOTet65M3VZbgTmVXubR7rtEyYeCqLamTNOLL3/tyJvlD/NpBHco3OysJ 5R1gEeMdnHLcsdMxB1ETkKQ7VfXHo7m/xSiHoR2Ke+wT7VO0LCgsbySEJyaf+2AVIN9H Uj45sJhHnMEEC0uzBl5ejpLK7IMRO2Smd4//sb3tlp0+CMHCDjJnKOZ61CTRwK+2izGn hZhQBJoT3qi4A02OsYDUDioxkIUUatpRSUa4+Ig0TVkZjdHLhxWkSLBMBRkdouy8n0/t VB57hU5YWpUWGRFQCjbmyL6hRQWsp+NcnM/fKiWBAMzZrpCbm70gJVOFEaTORzuLefsj 1pRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782619; x=1785387419; 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=PEo93JS611Eh7dmwe+JUB8z9vPU0sUw8BMmAuZSDFOBm24LH2Rq3ic+UU0WUUi0Eyw eqLxedBCZxI9wz3+u3cgXKCxXLzQSahY6vUAXrA41V8OGtRjtIIQLSfQnuSL5feMPqPP 4OfpKb1sPu6OyFNPOsrTmHiYndr17vAC8nrEOrgI9ldhhMRmbELTlIiIiJs4w8HcSe2T udw+q8Y9VrJB864svBSJNzdcPyITybwOYwcpT9/xlqCeTMcW4TN5GfIOw4aYfJRRHAqG N7yq8q16cXuWlezYHyw9oGa5T8hzXKCGC/E5tjMMN3T06ALpQ+Jnx6pTD6GP6JvXKZI7 pGvw== X-Forwarded-Encrypted: i=1; AHgh+RpsPfdPqKrusfBaqtFgjqMrT1dkzyo0KAmuP9+2XST3CEeiGRul661DeWUi6o5gpduHjHrCIgltmfQueUU8@vger.kernel.org X-Gm-Message-State: AOJu0Yxcn9UeaTKGB97zyrKdPICdxCh8MgKm7hd/S+gfBvP2f/vba/as T/3wKhZ9qYTlnF3+R89kn2StD4sU4Vs1P1HtC+f9qF+aroCvt+VX2rfi X-Gm-Gg: AR+sD12xofldwb+i64D2l82oJ2IjrbT/zbdHhnskmWStVZvf0yS21H4xM7q+AKifNsu tpAZyznG3PD4SvkcUVKxg9UO5GQ++puevqQx3nnMgIUMVTbT2hhmFbitfsEa7IpTMJTUFPFXYzv TzMK0IayDRzizIzsAPAN7CTMm5KIzElBlsYtuzmJdZ4CXqU0uFKN3zkr2skOXGXBmEtIJH07UC+ elIKWLDBOqCQDQuXxxVDALnjn9k9tmOCT/wi+Q9AvQC3m3CKPPLEuoANs9vS/VEtVkjQPWbK6g5 PB9FXyAblmBPJ+MnP1d2lldiJ+K0E7xXy/WwcZO0H4U1gVJG1ShenQd/2LT80zFdaU0mfbvUY4O 2uiIwAZ/2AIg/0Yn9IiaaVT3TywiXtjHRkSC2PyrNCFo3REVhIucb4H0Z0MrlAna/qoSKS7QRRz xhBR4m0EpUp1rQRIio/09Dv76ql4LDr5LbO4H+ X-Received: by 2002:a17:902:d50b:b0:2c9:e69f:8b0f with SMTP id d9443c01a7336-2cfa6b7e369mr21677055ad.17.1784782619301; Wed, 22 Jul 2026 21:56:59 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:56:59 -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 26/26] ASoC: codecs: wsa88xx: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:27 +0700 Message-ID: <20260723045327.28260-27-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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