From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.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 4331E3F6C24 for ; Mon, 27 Jul 2026 09:43:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145440; cv=none; b=KxlCu0KIhI4T1wwWKYW6o6Q5qyU4L38b4dXu71ARy3WD0jrIhA5kDy1H3dxz/AHsc7k2IAB1xoC+PuLq09wMWReFJvKCS3d3NL2KqtSoAI0lWln5yK5jZy84KmF9T2QvM+RM3ivU+baXYomMsdGg/vMTYlLJisNwrhACG/D/NdE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145440; c=relaxed/simple; bh=XnhnsPyA5QSjzg0tuQcdHLbqpbZbFqUdXNayJneipxM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CY4u8EqOHQW569f6Bovc2i/BYTW78XK99ee/nDaLFpkOKY5PAvMdBwZVKHMLchOni3fQMy7ZxmdYY1enI+xyXQuVnygBrYCHhU30TnCmtQ/IRnwCTlNRDUWKNYPA4D1pfv3tii+n46Jh50LYdhNOijKzAb9qZyYP9R50WVqrDzU= 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=FWqzn/RX; arc=none smtp.client-ip=209.85.210.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="FWqzn/RX" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-8453427d3f4so2553617b3a.3 for ; Mon, 27 Jul 2026 02:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785145438; x=1785750238; 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=RK1Qg1zMLuqf3deYuh7H14WODBPPcltBb1uxyeY+ius=; b=FWqzn/RXAMMjas9QHSwifesFUKhwy2BoFM+dY9RAZsgoWlRaVHcTgidp4LhtsR/qV4 DeMxaY3MnO4eHzJ2oshtkyQwkcv6zrilCAdbvRN+oRvF1Op3fIFa349Tk7DBrHZoF4av HoSUxqWmHRiavtptp2cVfi5eMfUVdhNNHgAQ9B+Bd9LLamPW3v1pxCH52NbrfsqH8PnN B7EEKdZyAMdoNShowM+eJ9oHXWFrVRdoEzvdJW+zb//wMAH+jHKfWXPD5ZvLseaIfI1T 86uzYOcp4EzAgVQxNfObiJBnD9OK8cNSO7ri+hhwynJE5P8QjE2JEX+YNyi2Qjpw+WL2 ByuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785145438; x=1785750238; 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=RK1Qg1zMLuqf3deYuh7H14WODBPPcltBb1uxyeY+ius=; b=XQsJ93FaoZ6yVnHw8p3QXLE8UnIHFBfM2qeYthzLMGh54sn4ooaKpSyvm229xdUVPH 6JaYO+KpOmATazh+WD6GRnFby2GNCBhObdZiCRKM7EMWBZHfKchcNFIKI2fMguSwLTSn jminMdw9iZtNN9WE4QJaCbKZYrc88I0E+TsHUnknJeJqiaF6ebkPUwmbPlDYQRoILHhc rRWpVtDSNJTp2HIonOjAeiuIEhQfSQar2d8wi4gqB/kDwcrwC8s5Vq+y7MBhrXDy+kcl jAlWIWsPLCwuAzNuyxjMeKlSwJRMv+YT5Zx+AWK65a1AcgF/Lg7/CyVwBcVz4eR1bv+J hatA== X-Forwarded-Encrypted: i=1; AHgh+RoG2LZXJHpKseuSlVKWU43sxhIdh56InJ8sZo4UlyMLtwPdinCKTlLTPxmyIGvUcg7dWOFpzQ0Gh26uYg==@vger.kernel.org X-Gm-Message-State: AOJu0YxJLWLVLOMIL8ydND3XsDWle5+c2d5T4d57ypd8/e6bbxQDi8Yt DDl302CI8NCZg9u1S09/tcZKjo3+1SuAGp8G0r6c9fdNUOqwtdi0LuX4 X-Gm-Gg: AR+sD13VOOaQ9rSERyUCff9oDBFx7aFQjutX8iwVBjuQV/8/tD3iG1FQ8tzhBcT3Pyz YZHJcnmWY8CjW76pEy3QO/G6/JHDNRComFmO9OVXnOWbH+dfR/Fw8nthKEtq82fb5tCLViULabl /TzuqWV9e+8k61tvOsWY0D2jdbosDGTqUeyFZ3sS3q3/4i3uMGRpInb1VDtZG5Xk4p0JlzXpGFa ntemXiakRSzZyTecssKGgoWMp0qe1s3yWngnik4XzJMALwvGriH4vcS9BoP6BgRpvVmdPS8Moub Gg5RDYoDTfsEwqTMC6YG0ZcFIhggcmX/7hwAyOingeefv2y81UXoByPY/4kg/qhAed5znk4tbXl dSQCl+1tPTh9eFLQg8GJEvS4IrzfduKpHvOWXfdEdHphTfWDBV19izwoQo0UesktRsjQl6Z5k6I +7Ri48rYoyETMNkKFiv50/0h0dCiUGTLQMwcHsC6shntmD7Puv4z9KUrw5UvWrBsirEcfu+Pb0a 3HyItKv3h66ZXbGscV3QA== X-Received: by 2002:a05:6a20:2589:b0:3c3:b57b:6455 with SMTP id adf61e73a8af0-3c67e0b1e4fmr7444326637.49.1785145438591; Mon, 27 Jul 2026 02:43:58 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbbb66b5ffesm2959018a12.19.2026.07.27.02.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 02:43:58 -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 v2 14/26] ASoC: codecs: wcd938x: Use guard() for mutex locks Date: Mon, 27 Jul 2026 16:40:34 +0700 Message-ID: <20260727094046.23001-15-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260727094046.23001-1-phucduc.bui@gmail.com> References: <20260727094046.23001-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-sound@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 | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index c69e18667a85..9a9ea37ecab3 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only // Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. +#include #include #include #include @@ -1976,7 +1977,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 +1995,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 +2010,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 +2035,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