From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 4ED0D3F0779 for ; Thu, 18 Jun 2026 11:10:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781781013; cv=none; b=IWAL2IlAcVGQxTbLihXCPb0TrVhKr79XcQd12iZrYN1Od/NSynZ+KUGb1hyoRibTwBMwSunyFBdvMo74O8uGrJSVBd8iqkHDx398j8IynJR24mlcuPcRH6D+VH73Og1KEcV1RmeJjj95EKLT+2omSbQySf3a0JUi5PSkExtPGfE= 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=inEz2h2J; arc=none smtp.client-ip=209.85.214.181 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="inEz2h2J" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2c69921bd15so4210655ad.1 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=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; bh=9U2r5uO0a4sNNWl3fg9q20Rk8WeevWmhUpMadyTlIYY=; b=inEz2h2Jp99lqLeH5G55XAmqYQCJIp6Vatoic/ugG88CtSYTJoPxbGs8eGnuQ45V0p JyygrIBkX208ZX2kGInYzlvv6mrKcvvYgQ1itdZGtBBUAS9/kJo8zdL0/YHpkE7oMnfN KTeBljjYJT2vi+LrKLfqM8Mg/CUzlgzci+6vZ5OcYqt8U9+310xf/3Uy1eXHwpaJLMg5 BmMCgi4lORp+PTbT1gq/Zccbusn7P9+ybnh6XuyqLDNHFKlqmnOgybX5Tn7lV6XI72h2 3jiR7tTLpX80cAoSmJ41lLgpOIcHcXYLPzd4O4lqQPGnL7T2v1ALJOZnN1/fGjHXrGiP ADgg== 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=FBZj7sQP/xE6bcp449ftVB1Id+v3L1p/O7gc6QU6FHgke5OUCUIpyfmlg+4QwKKsvv Sm3iIPkaejvRl4ukGwaPX6ZdYnX1/cRcCKV913eqqoA96tC6VTqYtGM+ggBlPaqBywsu oA/g7voMrEpW4DpHuE9ZN+5cb80iqLsTxWrW2bD7BXvx35c2lr6F0FASSlPGsdloVsTT iFMZg00zKrH5lpCWytsI1B5g/ZOtO8keie2NIwDW9fUaHgRhIdYllKVEKOGWl85htvA2 8TZiQALLPiEJuYsCp7YGlUwAsupuqbobt84DHM7hTKMCFx3aDME526b8JkTGph684Lxr ksCg== X-Forwarded-Encrypted: i=1; AFNElJ+zwby8CWG8bMoVToQvOma6Ay05A5vmj8pKDT/wxh1OZFlidr/vcbdANMBxjr2llvHemgD2ojVk84FdeVqq@vger.kernel.org X-Gm-Message-State: AOJu0YzFk90iyHVilH/RNNBg5qUI/ExTK8oJjmAUkoBKBlryd4SCtnwo 26o3cr1W/yCGu9VUJJ1/jGDlQhrv9Tt2kndYghGANV7vyFqDvV9SXLvq X-Gm-Gg: AfdE7cnA2uXnWzXjInsccKu+6AIZ+DH8IX6N+gb2DyD3lcbWpQMuW1XJfvt+o7/u+78 fbWfu/F3J82DeRawaXFnh+8lZocmXIpjpu9rp5Py+/V7ndbbWdDLrjH7A1+vBhD3rZNnm8pBtJT krakMXSOqURMi9VwsRJToQXJ2fKzHO2Y1phh9L01Of0dWFt4Fke0tOy447KMaGMbIpVR4fdCvSR js8FIxKN7Fd9wobMapcZe4gIP8Is3rzqBnmTTzPqbUK4Eb7dwaCJ1Af4mfGJa0RVMaknfT+oAfs d8S+GfR4cObI0/IzZj8HDdEI5KMAgGUiOOZYvNT59w4VECXO5Iow42uZ66/DQJtsFz23qitrcDE /vrhm2gqIMiuJ/nJTJINAiNAkxG3rvQ9ph2XGLOdYyfgXs6zobvbsaUNdjWsJaY4jOMsg5kB33g kWFF1A2ZnyZtguGN8VwJziXukEI1UT1pwHFfkRV4QP6UFLViM= 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: 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. 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