From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 28608345ED7 for ; Fri, 31 Jul 2026 03:11:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467494; cv=none; b=MCx9VI4baCmoAAu/Ql6lZLHEVXWClfU8FL7J24cFYBK41t+xNmPNBbZiQsr3ERTCAlrXsbUuFR/YjuzhgC9mk7Q5YYrP0k9bfSzkexmofmsAQOoQQJOmbk6WwktB1YE+QjiXqFvYqK4wnktdabgyfp6ete5y9Ozt2ZgpsWlIORg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467494; c=relaxed/simple; bh=j5EzUp9GOmwEDgm+25/nvJ3ZrhLORshzsn3d8vYHp/k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N3jYgoA+/HKgAywIrEF1W0Mft8tkEjQ6P6twbbgh3aAxsx3lF+fCxNp8tq4l3Pj8cnuWjGaJb4lWLV2S1o0VVSLOvsrd0xXcpp0e6cVy3YsGdydXiyiBDH6GXYaw9zA9H2tEkvnJBGWk56tsSQkKLPJ5G7gvSFrtQ1Cm2UNxvXA= 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=bX3up40u; arc=none smtp.client-ip=209.85.214.173 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="bX3up40u" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2cc7e86e7aeso4473625ad.2 for ; Thu, 30 Jul 2026 20:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785467492; x=1786072292; 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=gdWonKZwUM9E97TXsH6QIsXcmSxW8h25KlrkA4nBf18=; b=bX3up40uZ6zMkbKLhyfwl1IwXJpAIvH+J5GPxqmA1Cz9yixwTp0SXFdQ/4i7Ai0xxU H90vR76EK2OKQgJLNIel+/Ta0UvZ/feyyyMHhmsPkg1RXAObL3iP70czw3Re8z7fRWWG czGU+VOXf0xIzVRN06QhTsmmeLbDtSjuohp98M54hWwq37BhT4a6vrl0MTRZart5aBQa GOUXCGs0q/heRly5oVReZBri1smdkmh6B0Xu//2YQbzChKVt4+61srrngzCQNAHsHfCR Ri9D5Ka2L1nRIzcBitoTXOZ1DXnw/s0Vxada19vD+aDh5EqExIgMfizH2wK+pLMbM3xy rT9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785467492; x=1786072292; 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=gdWonKZwUM9E97TXsH6QIsXcmSxW8h25KlrkA4nBf18=; b=pPFRjGsW3N14XawPK/o87b8LHkY9l68OD0vizxlXTUqbY/l1xIMga+nURjttUgPvrv mT0BOMbeM5zNRoJDGFLFuBK6a91sM+OYUXwa1ghO/C/eIbtaEgJ9b1gSqdrXK0QrUYDc jWqRQ+hFl/8zJzrGu43yjrMv4M23g6bcs7MkwX+DxRRniUi2Ailh9kLqx/Pf1t0RQh9t eEo0+OrlK6WlMKrYnG2d2vuULa+aPZOXMEKBeWRf3U7c1lyE+RBd9c1exNuKWmRArhw/ dTvwzAdSa8AW6CMwp9SshIOdp8tGIRya/TWwAOik52MEVXOkhyxQGP75F4hzWrcfTZN2 8ajA== X-Forwarded-Encrypted: i=1; AHgh+RrsklbQP/cSthDGGRlqyxjLPQ6efeuudGdKr7ogGduspYqnIs2Xd4X24j68I61RNHBfamoSpE+HP5d6AwY=@vger.kernel.org X-Gm-Message-State: AOJu0YxdXE6bSIoDWNrvsF9RlG1IRBbU9x0fcuDSz7bJAjx03NMzs5j2 FVEhNv86PEHNzlR5d+oYlT0nfqA/UizGsk3j0rbEF/JIvTyAWlrcLsYq X-Gm-Gg: AR+sD10UQvzhmSe4p8RVuvD8C8ghFRKAsraq5nfEz+tzCfcnjzuTxJPPWVRXgSeU0c4 UOXB9sBtMQ+bQnqw6B1aNIQSruCCtZOvNKu4+lUqBRR3qQcEjvb0vC+DTudkcs0bfhL5htwBlCw wh6spRx7tUeOHDt8vP1QWBmfcxqXiitbVrcMrnEXtRS1CrVC4Qkje9Lnl2t1PAB9pnAENBBEAYC g0JTSOn8Jy3gDoCGc7WoKR+w8Hq7JoDfHxORq4EJGXD2tySxCGG5AxxihCRnLkFgKILQXBDdk8D P/l/8NbvVQlIgq4x/Ht+oqyUEg3C0eYqDeeO3889fukZC4tfJ3M3daVvRSek0nzvHbz80TUqazE mtfHggD9I3P6OM/1zVAYarxvYo2IlApwiFZ0oU3zhMWK4HIc1P8POj7YPi8HIF4mfcTrMmnXvBh 1foXGnfrvI5XeySp9AUK5D2JbtCrRskbUF8Naak2i2Pkde8dCbs1tGPU01sAeXt0w1sAuUl6MbN u5/yVjY+4WeM/g82RD4sFFTLVQpN0at5C+TEFW45Ubnvbkt5HfLu7RBkQZm5Qz60e/LVGNM11pl O/+7Hnn1AK9Y+qU= X-Received: by 2002:a17:903:8c5:b0:2cf:bf32:b754 with SMTP id d9443c01a7336-2d046d66d44mr5106275ad.8.1785467492271; Thu, 30 Jul 2026 20:11:32 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 20:11:30 -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 12/26] ASoC: codecs: wcd934x: Use guard() for mutex locks Date: Fri, 31 Jul 2026 10:06:34 +0700 Message-ID: <20260731030648.8706-13-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/wcd934x.c | 42 ++++++++++++++------------------------ 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c index bc41a1466c70..11108c37648f 100644 --- a/sound/soc/codecs/wcd934x.c +++ b/sound/soc/codecs/wcd934x.c @@ -1265,13 +1265,10 @@ static int wcd934x_set_sido_input_src(struct wcd934x_codec *wcd, int sido_src) static int wcd934x_enable_ana_bias_and_sysclk(struct wcd934x_codec *wcd) { - mutex_lock(&wcd->sysclk_mutex); - - if (++wcd->sysclk_users != 1) { - mutex_unlock(&wcd->sysclk_mutex); - return 0; + scoped_guard(mutex, &wcd->sysclk_mutex) { + if (++wcd->sysclk_users != 1) + return 0; } - mutex_unlock(&wcd->sysclk_mutex); regmap_update_bits(wcd->regmap, WCD934X_ANA_BIAS, WCD934X_ANA_BIAS_EN_MASK, @@ -1328,12 +1325,10 @@ static int wcd934x_enable_ana_bias_and_sysclk(struct wcd934x_codec *wcd) static int wcd934x_disable_ana_bias_and_syclk(struct wcd934x_codec *wcd) { - mutex_lock(&wcd->sysclk_mutex); - if (--wcd->sysclk_users != 0) { - mutex_unlock(&wcd->sysclk_mutex); - return 0; + scoped_guard(mutex, &wcd->sysclk_mutex) { + if (--wcd->sysclk_users != 0) + return 0; } - mutex_unlock(&wcd->sysclk_mutex); regmap_update_bits(wcd->regmap, WCD934X_CLK_SYS_MCLK_PRG, WCD934X_EXT_CLK_BUF_EN_MASK | @@ -2384,7 +2379,7 @@ static int wcd934x_micbias_control(struct snd_soc_component *component, __func__, micb_num); return -EINVAL; } - mutex_lock(&wcd934x->micb_lock); + guard(mutex)(&wcd934x->micb_lock); switch (req) { case MICB_PULLUP_ENABLE: @@ -2446,8 +2441,6 @@ static int wcd934x_micbias_control(struct snd_soc_component *component, break; } - mutex_unlock(&wcd934x->micb_lock); - return 0; } @@ -2488,7 +2481,7 @@ static int wcd934x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, int req_volt, int micb_num) { struct wcd934x_codec *wcd934x = 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: @@ -2506,7 +2499,7 @@ static int wcd934x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, default: return -EINVAL; } - mutex_lock(&wcd934x->micb_lock); + guard(mutex)(&wcd934x->micb_lock); /* * If requested micbias voltage is same as current micbias * voltage, then just return. Otherwise, adjust voltage as @@ -2521,15 +2514,11 @@ static int wcd934x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, WCD934X_MICB_VAL_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 == WCD934X_MICB_ENABLE) snd_soc_component_write_field(component, micb_reg, @@ -2550,9 +2539,8 @@ static int wcd934x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, */ usleep_range(2000, 2100); } -exit: - mutex_unlock(&wcd934x->micb_lock); - return ret; + + return 0; } static int wcd934x_mbhc_micb_ctrl_threshold_mic(struct snd_soc_component *component, -- 2.43.0