From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (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 3E9433EBF02 for ; Thu, 18 Jun 2026 11:10:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781781013; cv=none; b=qZWC67DVHUCX3uECzEUYmQqDbn0a7AQRAhvxV1N2IYSSoMwgdPIw4jMRDRfxpXP5+AU2dijWoBI9odZP9wSq2azUWoc0F8O1CC5+WrHE9buwAVYcrpQdJGQq5PhHnNDRJL3ipx3MwAzvsq0vX2NsJvIQCGSeaHgqkv++7g02/9c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781781013; c=relaxed/simple; bh=r7r9e6ypW8qX24PwRXoC+9CWtRWiGGy/uP12p3KkF1M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EOfZD37WjC57mZ9OKp/rDWYpyxh4Ui9/aaPmm66kIDE2mhodusl4x3mbYa73Yx7M3WT1wmTExLLBS0TctIuJ9CwOHilu2rYx0DTTft+ky86ljkxf0DbP1vm1Loj2OiNtpq19lZNAbSfNQGVjBof3pQNTuNM0hNze3T/jLgHrswY= 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=Xn0mKlxw; arc=none smtp.client-ip=209.85.215.169 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="Xn0mKlxw" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-c88e3e82d81so418942a12.2 for ; Thu, 18 Jun 2026 04:10:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781781012; x=1782385812; darn=lists.linux.dev; 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; bh=9U2r5uO0a4sNNWl3fg9q20Rk8WeevWmhUpMadyTlIYY=; b=Xn0mKlxwj2RYEq/HNkTkkPiGbhlS9B5B6Sjqkr988aURHyZXCtdvIutipEvpkhXiOb cT2208zwfvIt/UE2YARCb+wgdwZ84OovArAQfts5bDw9kS0/IFY3UoYPduXztYlpDjef b8uc3NIKTZsjFdtEyBsTJg92P1sg9RCkvRgT0O6b71EucXi++TkOWnJ5wcwUKOp16Bgp koZ92lxXbjime1e4tbfcpQrYxVLEech7nqm+G4FQucEXCgYLJTmc/TqN/xqkbMgVZ3mH YMXf1TZeCrsF1+PjOUj6lq5NFqtDBoYKK+uKgC43I+zRWz1UGRrkoZIvQqP0RHM5ejns dseQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781781012; x=1782385812; 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; bh=9U2r5uO0a4sNNWl3fg9q20Rk8WeevWmhUpMadyTlIYY=; b=F+YLcRf66MTRuYVw2sHgKntvvEZJDFHknYOxcSNAUbcgUqYkxmK7CQDSeyskHXIEje ZOfqyQ7LMAYw8qEtw/C9r9Nm1qVd5oataGdPQvnwsU+5M0B24mWcygutUS4QLG3jx+7E LbXipNbJeEBJqJW9qyw4ad4GF7sGoE5nshKacuFMnj09PI9B8yLx/Bmm2ed6bKf6otuk m2YTA42Q+9LskIvctt0r7kA5ISg6tr5V2ktD5z/yTONlNIPLzgFXrbO+hLIZQERb4mNO jdcGoAszC1tNrLD/HuXdKuLE30566Sf2Lk4hJ6vFvOeXkWqhQor5MaFRe5gZpQTRcPi2 TRdw== X-Forwarded-Encrypted: i=1; AFNElJ9XCaWaurltTEoH2UOW8RExOA2/XqlYI+M0KFJw/neSZsMmwXMy9iPsrSVhpJofAlw3CqemOQ==@lists.linux.dev X-Gm-Message-State: AOJu0YxrAw3d1hAl3/1bPL+PN5cea2DkQuP0PJjCaJRTzBCog27vvs6G ZFxkboq7D0M6x+sjpaEghUi2ndpsSxioGsqzJ2+/xi7aPDkMXvJy+Vk5 X-Gm-Gg: AfdE7cmt/F98nKLQEq/p4DUkWAPTOWi1Ktx0dUK/MHMQoq5TQiSg4w0ujqPQH7i1PuY y8JRf2/uUQSqUOJLQVPC1vzHfUjotqkdJ2mtC5s/NtA3ElzOQZsiufrc9F1fI3S0pDq/nX9u44m /POplmFcEd/g3F/R2TmPn63UE9wrdpkKUTahdItIK+x7l7sc2TNMH0QDd8cbWrjUq2IhnmORvKq MkconyOttjuhItCOmfj9ZMgbTocC9pE4MncvZcjFvkMpRGb378QxleFnrMUuD3Jak7MKSoXjMIu d72qGcRmfdB3QHuwGBj2Tuwjr9c/SdC3Ba478IYn7joLmFDynDFmbGQrbazKHS+jklRT8oGQXMh pgmFKswI/xFnqh4SA75nZcbScTqASlL3OF+ZbDqCyawfWwRo2xRULsgeCb4OhPuRskNDR856h8e eknoilGdxNyXAWspfV3DfRjsp+mpuuH8OQyFBkVH3m1VwdImg= X-Received: by 2002:a17:902:ec82:b0:2c0:b5c1:8e3e with SMTP id d9443c01a7336-2c6e472d580mr33156445ad.8.1781781011500; Thu, 18 Jun 2026 04:10:11 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c42f1f0f19sm196384565ad.10.2026.06.18.04.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2026 04:10:11 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Cheng-Yi Chiang , Tzung-Bi Shih , Guenter Roeck , Benson Leung , David Rhodes , Richard Fitzgerald , povik+lin@cutebit.org, Charles Keepax , Support Opensource , Nick Li , Herve Codina , Srinivas Kandagatla , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Lars-Peter Clausen , nuno.sa@analog.com, Steven Eckhoff , patches@opensource.cirrus.com, chrome-platform@lists.linux.dev, asahi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, bui duc phuc Subject: [PATCH 66/78] ASoC: codecs: wcd938x: Use guard() for mutex locks Date: Thu, 18 Jun 2026 18:08:15 +0700 Message-ID: <20260618110827.232983-10-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260618110827.232983-1-phucduc.bui@gmail.com> References: <20260617103235.449609-1-phucduc.bui@gmail.com> <20260618110827.232983-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: asahi@lists.linux.dev 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/wcd938x.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index c69e18667a85..9eef1ecec352 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -1976,7 +1976,7 @@ static int wcd938x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, int req_volt, int micb_num) { struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component); - int cur_vout_ctl, req_vout_ctl, micb_reg, micb_en, ret = 0; + int cur_vout_ctl, req_vout_ctl, micb_reg, micb_en; switch (micb_num) { case MIC_BIAS_1: @@ -1994,7 +1994,7 @@ static int wcd938x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, default: return -EINVAL; } - mutex_lock(&wcd938x->micb_lock); + guard(mutex)(&wcd938x->micb_lock); /* * If requested micbias voltage is same as current micbias * voltage, then just return. Otherwise, adjust voltage as @@ -2009,15 +2009,11 @@ static int wcd938x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, WCD938X_MICB_VOUT_MASK); req_vout_ctl = wcd_get_micb_vout_ctl_val(component->dev, req_volt); - if (req_vout_ctl < 0) { - ret = -EINVAL; - goto exit; - } + if (req_vout_ctl < 0) + return -EINVAL; - if (cur_vout_ctl == req_vout_ctl) { - ret = 0; - goto exit; - } + if (cur_vout_ctl == req_vout_ctl) + return 0; if (micb_en == WCD938X_MICB_ENABLE) snd_soc_component_write_field(component, micb_reg, @@ -2038,9 +2034,8 @@ static int wcd938x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, */ usleep_range(2000, 2100); } -exit: - mutex_unlock(&wcd938x->micb_lock); - return ret; + + return 0; } static int wcd938x_mbhc_micb_ctrl_threshold_mic(struct snd_soc_component *component, -- 2.43.0