From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 CAF753A4F3B for ; Thu, 23 Jul 2026 04:55:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782533; cv=none; b=cNg+6TOrQ1FBiwxO5jwdpUDkOR2YC7gsr73xHSi7jA9QTLvM8/RQ9DN9q1WK8QbLZ9U7yZJdOr8MtMBWs6gTDoaEmaLmGbctzsY+vM++60zxZPKgyL1y0iyLnw3JBbFRzWqFVGxotUrfsR08gKkf6dgo9So6oZADwTF4bZ9nDj4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782533; c=relaxed/simple; bh=j5EzUp9GOmwEDgm+25/nvJ3ZrhLORshzsn3d8vYHp/k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=slBzuoEnrMnJ9BWZk/QShU3upyHP8DqGJyvancpFgeJ2I7LcFyhR/bw/47TOVwtva/D8kYYISBLa5bTyi21CzxzF6JA9VRMOd3jH9zJooQ143du7Y66IMCqHO73n9ekkgcAtYvwc1YrU/mVGE3C/O8i+O7Qa2WMN27MU+uaqAPk= 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=NV2yn7rb; arc=none smtp.client-ip=209.85.214.179 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="NV2yn7rb" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2cc73e322dbso2560345ad.1 for ; Wed, 22 Jul 2026 21:55:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782516; x=1785387316; 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=NV2yn7rbiUIN0epKd6Lk9DuqQRi1oTAVqnk/+FWVOqvLqP9aXCiRR56E0eu5oPhOQs EKhu1NtP+Qtkmzl/xcZxjzxcjAdEFRE9WGtB6o4e5nvkCJyAx/Q+o0oZMKsZyDOsF6P2 h3DRtbFh3R+Z/1CHkTIJjoEk9IKRBzQ8BZuXGxSLpDke1ayj8pfXzlwa0s5GfG9XVFuB fRTWdAzCyQ2y0fQJaU+QK2ntLNcLSs1ARXzJtSfyWIAMOPqxBgKJR8DCRvyUxntf3PhR gtG1msqO0G6dQo4AL5JjV/YYhk1VUSa1uns7qnZP0dY+MDd5TOS8kIkfO7aUJo5u9G4W u7jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782516; x=1785387316; 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=LXhMnUT6wJASF1kD1vmYO0Df6cWlBKEy7swi+nenEu32wMVxCORpTMS4qhBjafGgWJ w+Z0sD1owri20BvunvWWHwAHTb2coOGIvDTnOlMDhBR7ERTnUIDjw6zRdeNtuQl2hbEQ ukRKDJf3ZU4CIBIvkryZtDE8HURNrgKpjrjcZKLK+4xxGKLvYN9+IpoSIdIttTu/KYik fTRO9u5tYyc7KZ7nsiIYXJU0flPhMSDN7PGH5TkK+nZ0dcutOmh3JnvXKVLa2LhtQ49S jaDah+9k4E2kKB1E8/ppfrIGZPnKZG7aZ2w+IJ+Gfl8AaH81FQHzHQeKAPIbnyNbNL1t /g6g== X-Forwarded-Encrypted: i=1; AHgh+RpSM6EKaVqjGakV1R9BfIZIG6187R+/flNnz3uJckWBg9ccRcWEoImyJrnmuMnx+02E6wAZxk5DWpu55qs=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+xaetLnZ8YhNrE2dScyPJ3ufKy7nkMEuX2WKlT8akRuZ2FdUX ILwqbik/a43DHXeoigV9muJ7+cV/Tuwxti+khUase2Dw5fZM0Q9h7jBG X-Gm-Gg: AR+sD133Y7dk1ir5nG3IPBIx3NcyRrkdia8v1em4Q6UH0jtqzzix19JWT5AI4ExCSPO ijxWGo5xKiFGaFs7T5J7oJza5ihJXtw5lAlabDKmnK/zmpd5sFrpG/ZU6rC2wtA7LknqaSrUSIo +1ooE59DSGMTgxjsy7B24dZ2nZN2mx47HGDbE5qL77Z2LWyR5HbY3IdRFf5j04JNHje9ZXDoDaj cU7R9q1VaGkSZdAoGEx62SI12rDS2ysYKWQXlp9RzNUbED0GmMhvRXwT6vv0t5ET8z1mmOqe2T8 UoafgX400+JQmxx0Vd3WgH/pjMQfwQzmk3ph8lkRJzvjViY0spflx2ckxeJAGZuIgG3XBW+q6vB /vsv362NDTzs/ehod26M1lQoLiOJmcGhLaNP7zp7tY3gMsdgb5V1I9aadLqL8En95SWpPXXrFtZ yf26lXiEk+242cOWXCrl4qLeLdapjhViA4Wz4C X-Received: by 2002:a17:903:ac6:b0:2cf:9f62:1dcd with SMTP id d9443c01a7336-2cfa6d83500mr22439685ad.32.1784782516322; Wed, 22 Jul 2026 21:55:16 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:55:16 -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 12/26] ASoC: codecs: wcd934x: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:13 +0700 Message-ID: <20260723045327.28260-13-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-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