From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (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 10CBF3EEAD8 for ; Mon, 27 Jul 2026 09:44:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145500; cv=none; b=X4Wlm0qp1bFHmaISdzYq7JHGTAvaFjhR9sst2yzZrGBX7Wo3NWecbGeJCdbsrf3i0J0CBGL0VkRfmFwCplIpPYFyg27wgDnILck0McSk/6TTe619EYWAi1Epdt2/CTXp6E3kzAX8iQBO2TMJk3Qhrt338tZeANnR/i2/uUP1T2M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145500; c=relaxed/simple; bh=ikAUSKblCmx9vPxrD4DiGAFfE6E6PV4GiFUbCqP8Yis=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u4LpGn+JzLw10lwu2g19vzpKweT666mqj2f1QWZL68ez7SBH3B8lUGgKt42u8iyLPDYkh7OQ4EYiCg8uo5JVP+mt7wJ3k/q4c861OGj42cIoiy3GyoCJwlbg5eduF2cXBiJNT4e5TF4QHOlsqS8baNAS3enCO7BTbN28DMJQlgQ= 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=qd0j6mQe; arc=none smtp.client-ip=209.85.215.179 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="qd0j6mQe" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-c9e0b89e228so1662470a12.1 for ; Mon, 27 Jul 2026 02:44:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785145494; x=1785750294; 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=isv33u6xMKa6TDMoSZBYo+IJ5dBBslRSk/9oncpo+oU=; b=qd0j6mQeBdze7RweYLyg0tWAWTkPZdSyBEfs4haMx1ed3fkLWQooz5if9mPV5ipSpF +AIDIIy9vgvZML/oEzrSAXH/O85LfgeN99xcfWyeOV3iXHDKK9t3h6fLSpbArU5+LKr7 54r4S+tljwZ9YW2MvEE7jHD2M3J+bcVPn9IP93vjB+mnk1IQDynT/cdM7vcvYBcYjaZr Z6LMzrYG23QUOeNkEWQW7yL2268c3huzdzkkO64n5y/UnzvQBgNNmE5ERJonxQFJlHxW /kLCaLpCfKeX6MxxnXbsq26ACbXZar2o17LoZ9CsENN0hhLPANjF6FxvD8oSurXPqeru uA8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785145494; x=1785750294; 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=isv33u6xMKa6TDMoSZBYo+IJ5dBBslRSk/9oncpo+oU=; b=LU1O5JzBJsOIsS9QpBHKZP2yET5FzWpHP25j0xitFO506hCc5xyvz4Ds+yG/xTVg9J bveTSfHNRsH+5xAMuu4mcoAyI5W/N/NYFRGGHeSPA5o1R+o+6DqRnbBjucEEmLL5LPJo lP7QN5IK3d02SgU1qAq1H3UO3QWf+RSa1X9KQTskgr8JZ30CMvIkjbH7kT6rH4xzimVn 858LhyuBge44763E2Tbi6Hy0zewhvKBWbLw1vn5dl5keNYMMvjCMz+mx80ESQotqw7m7 09rBlqw+Kw6LPD4mu/mNyMpwutxaRVvDgyquzf3p7yF30qZAg9f15J+QeQRdQg1BFwho BI6A== X-Forwarded-Encrypted: i=1; AHgh+RroLlj9v6FVAvzqruUsOFx1uynYMX/gBrsskUMGcQQakog8IlOf5k+KOhWjpddmUbsZPU68ilOx2QzgJQM2@vger.kernel.org X-Gm-Message-State: AOJu0YzzRNzJhsLw9TwXZc5Ik1e1x8+mDapFFQCdUoDXDyTZPWkmEaeZ KdlOyVKsBOJrSl4v/+PTSQ5pLR3Py6x+CSGbNQfqLULCvcXavNq2GiLR X-Gm-Gg: AR+sD10v0SLocLx2KozB6XXufSw0C6IneA2smIb+u21lxJWKIrH/I4Jzyd/HxL5twnm yugqIKEKlK2eSOpg5qlZQLtz5q5KRCEunK9GcC4gMVa/fYP0vlx08oE8ltJ8MPdlLBJR09wjykP taKuiA+YxSYiXLIhwoy+J5xcLQxtBjbAP0Ss/fFOytJ55bUk1zo7o/+/X3tIH5jxmFwpwoBrZUD kylZPuYf/tm6DR6oRMnT5Xen+rfi0eFeieoL/6AC64cHmo5Fo4CgI/R/ZGCBX+67uB3owhwCJsO 7a7GixEOKYgkmrL2c8gTyEbkSKImeR/AVtFaoNhU6QqEZfgKzFYhajB/AsUTyQrPiBz/yk4ATHo BSTdJfDKoNONsC1+MoSCbzw1EUHxcWMKu4FEEJJoKU7jQZJ8B86OWzm2o7F8EXg8C12nu7sXOER tjZlBk/hsBVqIsdRd0RCv+QK1z2ngUympmovxT95HB2ln/pnIIt3YS6S+monE7wxZazII0Sd5Vo x2iEs8cHcHqmtbh+EV4Hg== X-Received: by 2002:a05:6a21:4c03:b0:3c0:b55a:80ff with SMTP id adf61e73a8af0-3c67da78f78mr7990712637.24.1785145494540; Mon, 27 Jul 2026 02:44:54 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbbb66b5ffesm2959018a12.19.2026.07.27.02.44.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 02:44:54 -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 22/26] ASoC: codecs: wm8962: Use guard() for mutex locks Date: Mon, 27 Jul 2026 16:40:42 +0700 Message-ID: <20260727094046.23001-23-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. Reviewed-by: Richard Fitzgerald Signed-off-by: bui duc phuc --- Changes in v2: - Add Reviewed-by tag from Richard Fitzgerald. 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