From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 E7EF0340A46 for ; Fri, 31 Jul 2026 03:11:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467503; cv=none; b=HR68qHNhxyS9FLgL4xQYSrvOnyn4p2Wh7GtK7ib92+lNcWRWkYmPyiVeT5ePU6qW9F21evUVSITggnqfYJKvrXbks03XuYWrT5Nz9azp6BGgn14O2HpFKEtpEejsb40+WjmB9iolO5zlQvbuq/UVDpFaaQCnd6Xd3UnfZuG9ZTM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467503; c=relaxed/simple; bh=ejYwKV1fvCU+OGYNk147FP+gAndpm1ujSerj4glbyk0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D787f5W6HcVGVi5VypN7o/dER+HiPpDwGcqMRUT8bwoDuEuM0TvSF2ATuth1rVkCWBXPM/af7hKB1mN/3ZYr2pHsgReZDt7drGQ/64o6NLQP9zzvp9IgWluO7tkKAeCWLB39dYaWhIv4h4w7lORqbmvNTlYBz+6SDv8G8PS+q4I= 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=JabWkbSV; arc=none smtp.client-ip=209.85.214.170 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="JabWkbSV" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2d049069377so71965ad.0 for ; Thu, 30 Jul 2026 20:11:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785467501; x=1786072301; 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=PMQIA5NlQdKTc/dqW/t5DllpXIgAMPtDSEZ406vK3Lc=; b=JabWkbSV4H1erldfwGeSIN5t+MrJEN2ukgUHWpjgZUWhcOux1+5J1//tOwyAOyrYas JQKAJs8Tv0gOTxAWqFK4SD6zwUY5LyY/Wv6XRrf7CCYMNjXUh7CEP3TUjO5TPWuJfK+9 ASc1vjzYWSmuzDPI7CsSem2pFncwDMEoYlVuRpaPTOGrM8MZzDFhnvdU7SZf06ec/Wdc ryE1g7a3V0VMHxMFIZh56XjZlzEPYM+VlnnmJ6/6+6FiLwIg97yk8kw2c5NJ/IKgK+AD 1i5ZEGYvvX+Tot7Mv5J0jkRblD97jDDE4/u2FKbaGXHjoTMI1cx23ICC5hKEsf/gwZ8i rjSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785467501; x=1786072301; 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=PMQIA5NlQdKTc/dqW/t5DllpXIgAMPtDSEZ406vK3Lc=; b=e3Hyfrmvx9tKVbnr61p6tUUecwG1LqXRg5pZI/deTn695gx2ph9Fk1/T2o4GIHPTMa hr94/ObnImS3qSX38GhMT/H0IGRlXW40janXRI/Uhn4evF6wR4aNZxdPU70X0et02Vlr U9+TEB9peUtwIFJhSBLfqHjH+0Yu8mjsazXWPzkAS0/WWJFL/+3li2KOIT48WjruKFes vnblGBkuBYeio0I4++0adSF1MouIkRnqNaZEIIkJSWwYbr7B/cKpLEe8bP4vsTunHsa/ ROQ/gU4YDTN5QsWiRjS0GafT33Z90IMpl4pmvPvo+F1HB7KOsyJurX7I7MfsjDUX/Vfh 4JDA== X-Forwarded-Encrypted: i=1; AHgh+RrIbITX807MVGcBa4ksljD/xBZXZpdyMAqQQrnoIGl3RVqiNsm4sIjW4xXPa4P6m+wje5JGBFrKRY/Mif4=@vger.kernel.org X-Gm-Message-State: AOJu0Yw3IMDprHQ9PuenDUnJCkXU+c/B8vjHTem7FXlK8CNoJ4/GcH4x 90KW+2B2pwpNvwXBOJNe2RfiUpjFj/qGEvUb5mj7a8Atio4BrVPRT5Hz X-Gm-Gg: AR+sD111jh4U4rbla8Y4jubU8EsNjnr0YGMQPw5RRaOYF6kByKCcN4WszhbDcvlzxw3 sS7Ekpp8KZisi9/fja0jSBGa8CWTYRbgvs4ivywmb+jwj56xL1szJtXKDRXzzQoYVz5jpFmuot8 1p6DQYpl9LWwE0nYxys+90cmHwhVsRClJisfr5dvQQGCJE78eIAlAb9yc+7XwvyaaW4qLi92aGm HsD7IJ+PXxo/iukcKfwMBCK7AN3OLKvfp3TMVJWqgnKEUjckuMo05qbRYH8zsXmie4/vcxfXrFK qcVzlFevCEpzrHaN9F8FnXKpVop3wwqtqjWpmb5MNgb0qTrV/YENj1L36XVCSijjErEON/LGUkA qK/w9Cck+Z22fZR3t8z6I86J1z+5dK80xRYO3lyaKqbCLST5M/OMajHbhLL2EwcancwqXCzT1Xn baCrQTM0oXokIQ4pVc/4du4cjmXgBJSTFA0N5kxoJrWHNhbuoU9jqabT9YNN5T5RGdRmKvEhBoQ AQ4laE0m7wlw9aX0vavGEWV+FWlFB6lfvM6SyfAu65yZaytYjp/UWfXvb8Wasa0L+j8JxYO2T8M dut4 X-Received: by 2002:a17:903:2c50:b0:2c9:97a7:f543 with SMTP id d9443c01a7336-2d046ec8829mr4422505ad.41.1785467501244; Thu, 30 Jul 2026 20:11:41 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 20:11:40 -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 13/26] ASoC: codecs: wcd937x: Use guard() for mutex locks Date: Fri, 31 Jul 2026 10:06:35 +0700 Message-ID: <20260731030648.8706-14-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/wcd937x.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/wcd937x.c b/sound/soc/codecs/wcd937x.c index e0169e783ee9..0dd05604f5b8 100644 --- a/sound/soc/codecs/wcd937x.c +++ b/sound/soc/codecs/wcd937x.c @@ -2,6 +2,7 @@ // Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. #include +#include #include #include #include @@ -1056,7 +1057,7 @@ static int wcd937x_micbias_control(struct snd_soc_component *component, return -EINVAL; } - mutex_lock(&wcd937x->micb_lock); + guard(mutex)(&wcd937x->micb_lock); switch (req) { case MICB_PULLUP_ENABLE: wcd937x->pullup_ref[micb_index]++; @@ -1136,7 +1137,6 @@ static int wcd937x_micbias_control(struct snd_soc_component *component, } break; } - mutex_unlock(&wcd937x->micb_lock); return 0; } @@ -1460,7 +1460,7 @@ static int wcd937x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, int req_volt, int micb_num) { struct wcd937x_priv *wcd937x = 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: @@ -1475,7 +1475,7 @@ static int wcd937x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, default: return -EINVAL; } - mutex_lock(&wcd937x->micb_lock); + guard(mutex)(&wcd937x->micb_lock); /* * If requested micbias voltage is same as current micbias * voltage, then just return. Otherwise, adjust voltage as @@ -1490,15 +1490,11 @@ static int wcd937x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, WCD937X_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 == WCD937X_MICB_ENABLE) snd_soc_component_write_field(component, micb_reg, @@ -1519,9 +1515,8 @@ static int wcd937x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, */ usleep_range(2000, 2100); } -exit: - mutex_unlock(&wcd937x->micb_lock); - return ret; + + return 0; } static int wcd937x_mbhc_micb_ctrl_threshold_mic(struct snd_soc_component *component, -- 2.43.0