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 DB0383AA1BB for ; Thu, 23 Jul 2026 04:55:49 +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=1784782563; cv=none; b=IMbhSCEfBGnQbEuUlysrVvI2qw8ekeSusgJcDeJVsNo+u41kQWQLIWwwI/p3tC6G1c2O3UjM9XrTQOqoUaZpmD/t9O0GXCUTJ9Efp9gv+Wk1XuptekkL1AmhWuVY6C8aLWq133bL3GjWGmXf7af0z9Rhlcg0SCFLrX7MW3IuJPg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782563; c=relaxed/simple; bh=qfYAbMupB0dauUp98L0JPr8A4YLqYtXX8lr09zfUid4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N3fZH2fJCbVh6LYJk5bD2aHedxPX/5ZY6dGOoZw6fKEYMLibEgOrZd66DU+2X6WiXweRHSI7T0UoM9+VgnnsKoXjVU/nI74LDUlkK0tYu7PMJ/9Bt2myLoMHSG+x48R3Ew0H2s6XN9prGiVvlMG9WO28LW3x+BHx0dEmXZ1CGxU= 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=GSZdExym; 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="GSZdExym" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2ceaf8a1265so2805675ad.2 for ; Wed, 22 Jul 2026 21:55:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782544; x=1785387344; 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=GSZdExymy+6FhHdzvSjiXVp5pCk8wi/y4ja2+lLcDnzEvoX5+SYJdoDXnpgEfOzV5Z 5U2AESlLzSZ0EhOEic/1fjGEziv1ix8ZsLf0jY9BfdmvuAVYimzIJaIvAFL4/DUXHIJN TeN5At0DeSUjNHut4uvPF8ielCNK+Tt0zeUpyfo9CsGiV3pXwOAEDnlo/G01REPrj2JB C3qyAu9+MrFuYudarVKdCX8EWgZ6e3ZKTUwwWTupRNeoN8LddKsFysfBX+TQeexydWnA qHyQ3nv5VxFb/xZPEKAGdSl+D4YyRmKb2zMmlRa65j8FBnLdK9DwRg8zBFp78gPisb2I T0pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782544; x=1785387344; 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=JSXD0Z32VB4PJ9cpI0Q3XYG9iUpUqmtZevzEFB9iOaWz6KL29JcNF07wUn3C0GU9es A/uxqUxjH0RQ5Ru5MSknvrI3mTAVuJc8rHp9PZpssTqhOTWenwEtiquhu30z54Q2McSo 4UrROdfHyxAhIa4fPQ3so3JygVdhdyynNe9s0VR15rqhAI9ctEwNSxuUzLeQNpD378oj XfOrNcom9sJYLjzeSpHo+sjye9dLwFvIex//uJMNpIUh/BFkBHuW9Vqy6TCz19kuZH7M c47nPutN47HP+UYjr+HAH2AmZ/ODdYpBgKyU/8orE1XUvPs60e4qMChthX/nidzX3ffk UP1g== X-Forwarded-Encrypted: i=1; AHgh+RpBldemcRFto1tOFjY+Xw5+FiHhzi0YsBnCYTc+ANf4VMulBg+D9NfobXL5dDK+Xbld/4SN6UY1kQBJbg==@vger.kernel.org X-Gm-Message-State: AOJu0Yz9HBXEfMrZ5REt7/6t6dvkZswTg4Fb+e5yUp/Mye9gulJkrlv/ hlj7rJZQkUVJ9uPknBCidlHuWEUPXDK+XIe9z46CPaokMDTdh7I9l4sY X-Gm-Gg: AR+sD12yhQAfArDy8gPH5nfnxzVll4vO0KBQWrlCfZ3hm4/b5AUk7dWs38bHgD2BCzE +7uda505WEtzFFQzYWgvQZ0k/Z/iLcdtM8D9ddWmqfYA6pX1If2koW5YFF+70U8yduZnYVOw3vP zILlBU2uJjwCzHlq/VRBXcfxAkzvwWureMFp+t1NuQgaREMGcvUiwcZVUpbv+zhlxKI86tQwIdW go5JnJsCCWzBpRbguIlkdka6Rzld7n70Fp6VPhhb1f9MT6SYmErKPt4hVSw355S5xu70AtkvPZR NANazHmF5oXcwB1FQn5W/uU0RhYcYc9VTG/xgdbBtYbK/bkCImjKopYK6ECzrkp2f0z83BMopGF jy1Lg1Ojiwyq5PblHB2luloDvdSEt3S9xtrz0RbznRqOvA/o6XCprWNVwirF/5/3locwHWHhRp7 8walv1gG8OHqf8KShc8/Oa4EX/IpP9oIyQ2HlJuSvGfVcoBBs= X-Received: by 2002:a17:903:3508:b0:2c9:9a19:10c with SMTP id d9443c01a7336-2cfa71adac1mr19834705ad.40.1784782544311; Wed, 22 Jul 2026 21:55:44 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.55.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:55:44 -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 15/26] ASoC: codecs: wcd939x: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:16 +0700 Message-ID: <20260723045327.28260-16-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-sound@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