From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.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 BC287347BDC for ; Fri, 31 Jul 2026 03:12:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467522; cv=none; b=jnc/ibNJ39UmAEDfacDczBEqRPISYeIEEa9oec8V7elRI8H1PR68MM/FyIGmmfatwj5yvA4B8DmYXHqsvgQE+djP9W8bp2klZdah0SraKm28Ta4i7xcBxrG9fCSpr/1p6Tk6WBXpZCx/XEa9YTG4lNrCKFW+rDTjfxvaMSaNy2c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467522; c=relaxed/simple; bh=qfYAbMupB0dauUp98L0JPr8A4YLqYtXX8lr09zfUid4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tfSMYpew7fsWt854LisjE/wPdUb21P6+AQ2LjufM40XvpPn1KRcRSzxIwMV6+KiAF6DNQ/YCzvv7S+e6kOqVmAllOYDCCIHgXqWVqx7I4uvnw9uxYu68oVwwDR+ffPX3Na6lzHMduv7wCwP5ibQnH/vhCumfKxr8Amz84hWzUGI= 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=F3ZpBjHE; arc=none smtp.client-ip=209.85.214.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="F3ZpBjHE" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2cc73e322dbso4001565ad.1 for ; Thu, 30 Jul 2026 20:12:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785467520; x=1786072320; 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=lOLFIqbE35iIA1xT77FTcDNQ9ZNie7IeZCAAkiIj56o=; b=F3ZpBjHEfTzvJn3QrTCDRjHvc7KhMOsKSrVSCAKNfKiJnJ8cEn9WG72lWtdEQPhdnN k4krK+RDjLp3SwCnsv0wUUvXS8q/IcD5PgnWYthvgN+Ne37eNNlsjackFoiZRbj/rq0v ONYwt1vjr7df4Ga9gQpObT0MHEYLxxXoF/ArOPB4dS7Q/MZbAgALuW+oEXCEvBKgRXzB bqhRIHdevJMdQMSHuTTavLe24XU5WsNqrmwCNNRO3XM3zMQ4cpHbgd2MzwhOQ+FGdo3m BT7tF7hgWCT6Eti6Aq81TrlZDNV0KhElYW7PtdSlGS+MCH2vOMnpUIchDr9TpdR9V4j1 fgLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785467520; x=1786072320; 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=lOLFIqbE35iIA1xT77FTcDNQ9ZNie7IeZCAAkiIj56o=; b=pM6aOOoAjbOldG7sJiLPoNX2NI3Ug+8eLlNzY8YVHqvMAxFkQ6J/m8vOwWVcjlSXx/ 2IjF1ciggER5uthvMQdTkCVrTx09x1s3DzKMwt0XFJs8ZL/1/oWbNw2DrAfmRf8rvGdz nNaspXrqm2wy63p0NdWmqSZ1Sf0wIX/vQR9IgcVJSaVLBReTmDOQB3EdXAfdN3F9dJn9 C3QAxyk3d85DAkP8MGxg/oUor35BdseaEqPBPCoRHInSXbu9g0XuuCZKY3Dbz6/E8HB4 8k8csGp0gDTkWIQ8hkVJ2E6I5Pd8nhMBIffl34cts8/F8SpIJ/J/LBx8J7BumWaNbgmj oh7A== X-Forwarded-Encrypted: i=1; AHgh+RpCo0ASdofgtzXgBnk38XBOWSY2WxDkYHXj/oksfsTZvtOSA39KsVW4uYcpkumpqrv7lihHZe9r1s9+P1E=@vger.kernel.org X-Gm-Message-State: AOJu0YwavSQwug6imodZflRvq1fdV1BAJ6m4VcLKCTW5yr7q5jiFotbc LX6zS/RQTCO+gbAIIQoI0KAsvKIkuJeFfVY2sJXq/iIet5kHGJYtsbR+ X-Gm-Gg: AR+sD12Drzq294oW+bCk+N9y3JP/j0JqjJGyw5CfsgrT3NBQB03unSlVaZuvK/TQ3cW IQjntUup64+kyGUo+2ej4NOqLGKETZBZdyA02I6wamuQ8dCininLKLvVrmrjwTe0lXYfAPNVztd ArKCnpNtR/cqRdEWiJcGEeRH2ZB6y9HYmysbjWRIg8Xpf2KhIZZNXPDdMqXkjaHK8XXRs+yUcdO YHSUpNIzpueXg05AaysGBT73ziv3ChtyiZVuy+0oLLDPn7S8ZfLN+NkbsNVwKtowsW0lBkymyx/ hRNFBcWDOz74u+zmCCKNMQGtdUGaN32wO3Vb1diJ1vBltK3FrEXBaTNh6aQp1UJC2E4LiNkggTf 5hRacA3qv8jKrvd1lGCuWelP9eOA2e9NAOi5W3mOMNYiIP9dIzkPHmHvrHAYCqjJ/Wbgm5uduQi ThZd4Uwwa0EWwwnrLiAbL6omB1MTHteUEt5e77zmvTJ1mZzQrzOASKIR1MSNFrZ5/QKNQQLAUBf rX+afnCHljYEMMANGM5AwAUAJtPQYQz1K+xWd81/p8GR2yfDy0WsnEMYn7c1j6AmSBkpGbvXznu GxbA X-Received: by 2002:a17:902:e543:b0:2ca:329:3da1 with SMTP id d9443c01a7336-2d046dbe8cemr4696395ad.16.1785467519953; Thu, 30 Jul 2026 20:11:59 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d047ae9f31sm737595ad.60.2026.07.30.20.11.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 20:11:58 -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 15/26] ASoC: codecs: wcd939x: Use guard() for mutex locks Date: Fri, 31 Jul 2026 10:06:37 +0700 Message-ID: <20260731030648.8706-16-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. Signed-off-by: bui duc phuc --- sound/soc/codecs/wcd939x.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/wcd939x.c b/sound/soc/codecs/wcd939x.c index 010d12466722..26fe0b6313cd 100644 --- a/sound/soc/codecs/wcd939x.c +++ b/sound/soc/codecs/wcd939x.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -1923,7 +1924,6 @@ static int wcd939x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, struct wcd939x_priv *wcd939x = snd_soc_component_get_drvdata(component); unsigned int micb_reg, cur_vout_ctl, micb_en; int req_vout_ctl; - int ret = 0; switch (micb_num) { case MIC_BIAS_1: @@ -1941,7 +1941,7 @@ static int wcd939x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, default: return -EINVAL; } - mutex_lock(&wcd939x->micb_lock); + guard(mutex)(&wcd939x->micb_lock); /* * If requested micbias voltage is same as current micbias @@ -1957,15 +1957,11 @@ static int wcd939x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, WCD939X_MICB_VOUT_CTL); req_vout_ctl = wcd_get_micb_vout_ctl_val(component->dev, req_volt); - if (req_vout_ctl < 0) { - ret = req_vout_ctl; - goto exit; - } + if (req_vout_ctl < 0) + return req_vout_ctl; - if (cur_vout_ctl == req_vout_ctl) { - ret = 0; - goto exit; - } + if (cur_vout_ctl == req_vout_ctl) + return 0; dev_dbg(component->dev, "%s: micb_num: %d, cur_mv: %d, req_mv: %d, micb_en: %d\n", __func__, micb_num, WCD_VOUT_CTL_TO_MICB(cur_vout_ctl), @@ -1990,9 +1986,7 @@ static int wcd939x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, usleep_range(2000, 2100); } -exit: - mutex_unlock(&wcd939x->micb_lock); - return ret; + return 0; } static int wcd939x_mbhc_micb_ctrl_threshold_mic(struct snd_soc_component *component, -- 2.43.0