From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BA94FCD98ED for ; Thu, 18 Jun 2026 11:10:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4OY5fb/Dq+8t+PbF847YNuNR+1WYPM7PZhbf7meKQVc=; b=U0JJ3QxEA9qTzdrFBI1DEGwqA2 g+a0pu2AxJr+IDCIx5YAnKMlq2bEyRgqjYcfyIZnW+1FYix6mP3UeO7dyycK6HScQSRpHNoWqLvMU LVEBSDnqV6qDsqOm61iPD/S/RqeqhAmEGdP8UCvkgZ6m8BWp4tYAvBIicqBbC0iywz2hf78IDKfY4 DwFRGASpaWS8IXj6Hwe/E9Uu5PRkNjLWSUqBTMbNzo/nvzS7lOddhD+MJRppF7Y4IdJtRU6P1Zc2S sid737igBTDXslUWhxKMaqOf3bT3/FbG64GzPkOyR+ECemVId8pFQoRqFnh/C2Bqxtm25T+NQF3PP hZQHStZw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1waAdb-000000019uj-2hif; Thu, 18 Jun 2026 11:10:23 +0000 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1waAdZ-000000019sR-1KnY for linux-mediatek@lists.infradead.org; Thu, 18 Jun 2026 11:10:22 +0000 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2c68190ade4so14539205ad.0 for ; Thu, 18 Jun 2026 04:10:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781781021; x=1782385821; darn=lists.infradead.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=4OY5fb/Dq+8t+PbF847YNuNR+1WYPM7PZhbf7meKQVc=; b=os1lWWhBlLsM7MaSVK2jaPwbfeW4fKk2yZ3CakNLcNuQNc8Zw9yUHo6BFFFgB4PmzV N3WvjhIyxeoufx5mHLLmv261OLNhNQbiw7Q0eR9cPMDZw9aC068GJfUOHSnAbwpI3Pas wS8jLCevYAuFoDhZg+A2dL/RAkoJE0hSLOM0dQFR6rbjUHJaK5sWbU0pgZPXjkIWRUqY D12TK27x1WuGX77HgkEHtTvkTbprT1wGdKkyk0jJwnfkSJFxHqSERbWYGe5nt1FDG+o9 7VP7DNhQgbx1nMyDveuTjDd9aPb2pbcfeuoILFipMtLYVW7kSQqSRb5EVEh1v3R/47tx 8JUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781781021; x=1782385821; 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=4OY5fb/Dq+8t+PbF847YNuNR+1WYPM7PZhbf7meKQVc=; b=cHUNeRU6RPsXSetxXey3AIGw0pb+tnAlT504+C60/VFZJLqtr/B3uw7Y8idWgxQivf FZuhD+8L0SihitEuxphq++tgCsTUwOJMuGh9bHxGDhp6zmh1rLPpPGesUKXapj5YFqkE By3XCzrlMjUtKAKORWlmX6VsYyjA9M2G/IL0XCZi6bvg7DpwnjWfeJHFLIQKtUL81dTY PngSQ8f7vwZouC5AL1cwe7rTHgipfp1Hyco0JS1zYctinihOVkdds0K3x5TuDtGMddBp d5uK3AehuepRiXCmwBh4VIQSCYn06DaQ7bWyh0wfpWbyixgLZUpInLNyrhHZ+RrV0EOc Qytw== X-Forwarded-Encrypted: i=1; AFNElJ8mKEodSQiJ0wAh6qPf+Xxg7TbcOFGa2JBxacm4DqrVbairpcU+AZnChiMf0VVsmkWYoKdTGK7kx16Xi0j+Qw==@lists.infradead.org X-Gm-Message-State: AOJu0Yx1/GrG6QCsda+Yl2cqDVp7qBiU4LgYP+CU3mq8evuvXI6kWtqC FWscn9ne3CeeiOvhB8EKhjF+yDsQk6wglHx9dALrKLSQ/8QbQgNFIvHA X-Gm-Gg: AfdE7cmP/bUv89ybiJieuOTHU1dtk15KJmRbbBXkx4QdtUN9Yc/aCa9iSIQN7ADwYLC KnVU6pI/O6ADGza+fCXZORjSrqVmyNe460H0znIpoSBIf/IAJ8KaPw0aS8DLq4ZoJ5t0RWoVJzi SKJEztNvgIYIc2HKgAichCMYM7OGPbz5KwXEp5dZLB/TCsZfkVhy3BVIQAIkrnl+cq8IoaHu+aH FC4zbmktdQIOxsETRiiwuTiNbsziFM+LB1DJw39VkcnN12vABkPrvQjLVztd1Io6hHRY1hjnDp1 mm5JOoooRehNZgX6IeHcW9ecpSqBj8V3Mj2kfUhLHZ/D2YR1Km+VGBgKpvNSySmMFb2Vx4Aky09 pqM/ArRCMvW1q9jPBVTPASBK5Y+VT3kQcPEd91YFCiYHREW+YGQ6N7ecx3zeUPZumbaDgSN7ON1 RaxJ3x3JDAbmqoxOF8nV09mFMzS0jG2wEWJ4DOyHrPJ6cl/Kc= X-Received: by 2002:a17:903:19ee:b0:2c6:c9e0:2c17 with SMTP id d9443c01a7336-2c6de3f353emr31079685ad.8.1781781020504; Thu, 18 Jun 2026 04:10:20 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2026 04:10:20 -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 67/78] ASoC: codecs: wcd939x: Use guard() for mutex locks Date: Thu, 18 Jun 2026 18:08:16 +0700 Message-ID: <20260618110827.232983-11-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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260618_041021_404169_D6F174AE X-CRM114-Status: GOOD ( 12.24 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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/wcd939x.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/wcd939x.c b/sound/soc/codecs/wcd939x.c index 010d12466722..922b6a0423a6 100644 --- a/sound/soc/codecs/wcd939x.c +++ b/sound/soc/codecs/wcd939x.c @@ -1923,7 +1923,6 @@ static int wcd939x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, struct wcd939x_priv *wcd939x = snd_soc_component_get_drvdata(component); unsigned int micb_reg, cur_vout_ctl, micb_en; int req_vout_ctl; - int ret = 0; switch (micb_num) { case MIC_BIAS_1: @@ -1941,7 +1940,7 @@ static int wcd939x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, default: return -EINVAL; } - mutex_lock(&wcd939x->micb_lock); + guard(mutex)(&wcd939x->micb_lock); /* * If requested micbias voltage is same as current micbias @@ -1957,15 +1956,11 @@ static int wcd939x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, WCD939X_MICB_VOUT_CTL); req_vout_ctl = wcd_get_micb_vout_ctl_val(component->dev, req_volt); - if (req_vout_ctl < 0) { - ret = req_vout_ctl; - goto exit; - } + if (req_vout_ctl < 0) + return req_vout_ctl; - if (cur_vout_ctl == req_vout_ctl) { - ret = 0; - goto exit; - } + if (cur_vout_ctl == req_vout_ctl) + return 0; dev_dbg(component->dev, "%s: micb_num: %d, cur_mv: %d, req_mv: %d, micb_en: %d\n", __func__, micb_num, WCD_VOUT_CTL_TO_MICB(cur_vout_ctl), @@ -1990,9 +1985,7 @@ static int wcd939x_mbhc_micb_adjust_voltage(struct snd_soc_component *component, usleep_range(2000, 2100); } -exit: - mutex_unlock(&wcd939x->micb_lock); - return ret; + return 0; } static int wcd939x_mbhc_micb_ctrl_threshold_mic(struct snd_soc_component *component, -- 2.43.0