From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 ED53B345CCA for ; Fri, 31 Jul 2026 03:13:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467586; cv=none; b=oM/4QTiZubqm5Gl0EJVlZ6yjMbHlVLWTImZ/llBOgFQZs8Mp0Wi1HLS7bXhA8DYMfhhnsppUrdKEvbUzGpLvK6bl5c6q4fWrNserBrNWSOjSvUWesbg19UlpsQ3jqem9yGWNWs43OGy/qZy23FbYecVgHZhi2NUkmMMCc6lnqlg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467586; c=relaxed/simple; bh=PXhmUCCYjJMaODYQGzGhwVsJ5oviMRkUF+OhLfYe4jg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G3IY/5RUrS4BBC2IkfIL13X4ZsNJhrldAGFkGjL/qrcmer4dE/ODIR6C3gD8NU/PiPeoATpp/hMn+uTP1XXuBqBkbdeYFUt9KfD9KqQQfE5FCL8H8sjRiy5G9+OyUWrnvOGRv7ymxB3Pg9cLF3Xeu5+4+d9Hs2QUpi9TFDDELTk= 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=AqfX8AST; arc=none smtp.client-ip=209.85.214.178 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="AqfX8AST" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2cc7e86e7aeso4482545ad.2 for ; Thu, 30 Jul 2026 20:13:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785467584; x=1786072384; 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=tuKoDTJV7/eo9mQkxdlTMYT+n6rjtan9u9S68v0m15Q=; b=AqfX8ASTZ4sU819EeRYjeFjwbARzRcVTYvBx0QSVNu4l8OzPhtbejzLw+m9c2LVgRP 0NvJi4YPDKJRte4iictJYEhShGzdtgRpqA4OHsdRyju7PD2ZtA7GEb0tzC7biyKSnpFc 5+TcG1boBsf7wi9vviMvIHQsrvOlGpUzBgJ5knFPvDjSPBKsu/AYYxC2mkeCecHA9fep J3iKONrVGnfPjWNYKH8ZIw21nvKWJvTuNIEWHd6yeKGhpJLNr156feysczncnMfW8y99 ay45vV1T0QjLhos/F+MekpH9xZzH21vn9thZRT+2p2PVeoww7F/ev9epADqw+tVm842h ltiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785467584; x=1786072384; 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=tuKoDTJV7/eo9mQkxdlTMYT+n6rjtan9u9S68v0m15Q=; b=Fw2aImC/ouUhR1SaSAQtR2j7nlzlMale/ZkIdQD0jjvnVpH3bQJd3GolCsjqi07ny5 rz7LlB62a/+SMwiekxfEc7cW4vyzh1mwB5RWWK7fv+4PqnjzPM+MXwCQC09OOsSVHbyy XqKDEf3rwJK+gP8VEmAVIBWoWu0u16/9ItcSsaA+hy2kS5BNdBr9cMQ9WD0dYb/ZtD4J wN0cV/eYKu6Y+AMuz5cZ8JAM3+dd7je+QGQxYms6sYoWC//It11RIkSb/qlL01iY19Af vVIIImmaBzIILPz6SxSuxEOCwS4/2jVTHJWMfm6wxR8dFmZQXVW1Kf5fIEwodVNa6gtw TTsg== X-Forwarded-Encrypted: i=1; AHgh+RrvQXObsnbJ1+/f7kySFqbjyloSsZsKfhoFsN74N4KsJ48bDZSzL1bpJTjr3pfPCZuVmOW+moUrdk/PBWE=@vger.kernel.org X-Gm-Message-State: AOJu0YyArMhMTPEaLpbbvQoj1y0fLB1M2fH03VPly05vcgJ4HQxHNwoe XkQvB8CwBoPebmdV20dttvsk9JYKUPmjHa77+W95u50DGAKJkx8/YFcm X-Gm-Gg: AR+sD13efYmw36IqXCfzkYyd072bqLRlyvTcQ0sJWX1zBSrtBuPSly77krjh/eTzVFO /HyYN29/+RCjHY9sIZsHvhKYPTWe16Kj+nuFOKbei1S3mf4Qv5sLX4EpMwtGPzFTFLabyGm9lrW 3uKYHY4Q/e+IxHUzFsOyttsXgSpk1BzkPvq1G3zPLoS/XSaLB9gphx1ZueTAr9egY70s1T+nnyq fN/6gTMzbi9+JN2xOY8rPHHwnbPnfZNfQ1s2O1SaWwoSMwdb4UpFPRqmjWopxEkSw5HknKpB8JN Ru8ycuKf6JuPWCowBdWAQP9MwqcPnRZ8yS2CMjdwL8uk/oYXQmS59OW3RNh2/fBVNz7PP7praM6 ytrz3utwi2e5QhAWoBmb7+jiiQjKlVfVqB1IGoxVY6PZ6IR8KQIXt8kRblZuWQGqBt7iqF1kuba D6gR+2iZ1Wi1qTArLQUYHrF3ESbUPD6Ptqc4F2tNsJpXUb02+KzfyfXIr1yPn4FO47v9v70dWyt Piu/7QKNqWg6dWj9dGz1E2Q42c9WDJu8fci026/L4CoEbudyL5FUweH8oidI1o/h6DFuHxTivUf q/s7 X-Received: by 2002:a17:903:2f84:b0:2c9:bd64:8c8b with SMTP id d9443c01a7336-2d046e889e2mr5033125ad.31.1785467584310; Thu, 30 Jul 2026 20:13:04 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d047ae9f31sm737595ad.60.2026.07.30.20.12.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 20:13:03 -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 , Cezary Rojewski , Richard Fitzgerald 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 , 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 v3 22/26] ASoC: codecs: wm8962: Use guard() for mutex locks Date: Fri, 31 Jul 2026 10:06:44 +0700 Message-ID: <20260731030648.8706-23-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260731030648.8706-1-phucduc.bui@gmail.com> References: <20260731030648.8706-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. Reviewed-by: Richard Fitzgerald Signed-off-by: bui duc phuc --- sound/soc/codecs/wm8962.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 2db822fc1de7..8a9598161b35 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -1564,11 +1565,10 @@ static int wm8962_dsp2_ena_put(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct wm8962_priv *wm8962 = snd_soc_component_get_drvdata(component); int old = wm8962->dsp2_ena; - int ret = 0; int dsp2_running = snd_soc_component_read(component, WM8962_DSP2_POWER_MANAGEMENT) & WM8962_DSP2_ENA; - mutex_lock(&wm8962->dsp2_ena_lock); + guard(mutex)(&wm8962->dsp2_ena_lock); if (ucontrol->value.integer.value[0]) wm8962->dsp2_ena |= 1 << shift; @@ -1576,9 +1576,7 @@ static int wm8962_dsp2_ena_put(struct snd_kcontrol *kcontrol, wm8962->dsp2_ena &= ~(1 << shift); if (wm8962->dsp2_ena == old) - goto out; - - ret = 1; + return 0; if (dsp2_running) { if (wm8962->dsp2_ena) @@ -1587,10 +1585,7 @@ static int wm8962_dsp2_ena_put(struct snd_kcontrol *kcontrol, wm8962_dsp2_stop(component); } -out: - mutex_unlock(&wm8962->dsp2_ena_lock); - - return ret; + return 1; } /* The VU bits for the headphones are in a different register to the mute -- 2.43.0