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 CB050CD98ED for ; Thu, 18 Jun 2026 11:11:32 +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=cLWN4LTtmd7hng+ZhZtLQKsiVn6dQ6fE8GmkqrRR6IA=; b=IqKF44h3CwHuirFgqMciK6F2ia B+RDXuq8hFmYUtzJ1G4vUl2OVwscp49Ysbr6j2AOEkOxJ4tEC+LfW0V70SdnIfUVXpfXKjjbcLBXh dsR00guVCy7h6vJ8TYdfaqGA+qz55zbAzfpj9EoV4ZL5vgJtKmCvQnS9ledAxkQVeqtLJ0CpuzLXX 8FDvO9S4qut0XBgoIku8dU/hwcy/WbptMgPraTn5hSGI2s03L+CvApNgc6g7s8/h3fy3+0bQmsSkn 9vCQjBA1+NO/eSauyoUXcQzzyaeqjh78WEIx0srAQBG8wE0MZymNPaEpkGu6UIZJZ0NqGNAmi07Ai GOMsKBGw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1waAeh-00000001Ann-32G1; Thu, 18 Jun 2026 11:11:31 +0000 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1waAef-00000001Al2-1RVU for linux-mediatek@lists.infradead.org; Thu, 18 Jun 2026 11:11:31 +0000 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-2c6bc87f4d5so3298305ad.1 for ; Thu, 18 Jun 2026 04:11:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781781088; x=1782385888; 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=cLWN4LTtmd7hng+ZhZtLQKsiVn6dQ6fE8GmkqrRR6IA=; b=ARVkCd8PcvVQD4UgV7ioCFgLFsQRjPIRTj2+W3SO+0rB9Vd3eC7e5J/R0eik/ffT93 9xgT6zVbQxIC52teQp6OmVBJEL4oiz8nNhPQAgl0ZJnqsNBRmyiSSIIDlNkvvs7XafmW Dp6itzV9MFcPFmiyOXSL/WvYPB7W4TZ1emmeLZ/c3kx/7yabIfMIomZCjXTmrkTzOcNG ZhI/2jx+53wYMk/WE4qfPa2y8GjPVxMaGRsi8wKSMPhTXWb8i1cDUcL0wsI45ET8CLyL XYE2TDSsxNIMj3GrYjs7H8qA51u3K5GDJZTOwy+p4IlIUYw/zN2DmHN5qTYUGdwMmpwS d/5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781781088; x=1782385888; 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=cLWN4LTtmd7hng+ZhZtLQKsiVn6dQ6fE8GmkqrRR6IA=; b=IXEDT7CUTSUEcJm4p/EOZeWutyV5eXRtcetgYkD9B8sl8qH+aPvDrd0qLF0G3dWcEc yKOsLBAA5mKIYcTWwY8HwgQu9AudJruQsisMfBSfs/rKv2+HRd43Dm/as/GURAuF4UKu 7vmTuqJ7yqGynPDQkSgQRGGUlpfnaufmeT7ZO88imKB0KX3UTZBDtZghe+GvdwmM7cGU NdOAQpYtFoZCXGwlQ6yqrEUYsgUYKw7/Z72hnuLyF9rMDvU/ODyxTQNlhfkbEZijzAmK IzA1RsUBXsBrNYRCWtK1rUpahulGGmALsBudhtl5FwGHbemc+pGXWHVFWam1croN2HjQ g0mA== X-Forwarded-Encrypted: i=1; AFNElJ9jJd2WB7RyLlsAYIPVOjnwaQUc4NKSSm6aVDzkaM0Ej178SjnYrjN/IC8B7ztywRGrts/cWTvh6kTBCVc9rQ==@lists.infradead.org X-Gm-Message-State: AOJu0Yw7Rk2x5G1GWVK0VnuEPV8MO8SSFr/nzxsLVGeJnrMn90YLZh1S LjFFn1GOd7MGvl5+OQXAAJNw+c9HdP3LZfkQxnYVumYqz3PUwiEn08Zv X-Gm-Gg: AfdE7clWv5Sw5d6jcVrkmebBgC8SVGFLT7YajBJsuQoPRd9hqxRdmYAWS788ek7mlmM GS+xapPqAnIBWidcjUfoCvQu+pqFrayVF+7A1i91zRS5wAjysmhTbJ8Inm8zKHHXezRvne+AWRN se7PNgftNFSLgJU8Qk8U1WksR0MHP1AG/CyU4YbBzb3eAjqKl+mNut79x1wOAn/KwLP2fZa1/FY WKW/bwC10IMa6nXK2+FfKslub9AI+bz2ay1mt1cO9QlaPTOsra01D3nMB97GFcC6xcN9PW6NMFQ eMnSd+3S9ioBvDJ0LBizMK2N/+WmqqqBO0V30Ke6Iq75xgjm1Soz/YCz84Z4HNYTAXPIvEdDrMd woWzD501D+I97hKiKcZyKzX5MT64TiX8IQa3m/AJjT0RdbJO/Yql2yrCufbJACl0jbAJEFsTH6s KDIBRvKYaeVt80lK5/wfekCzE4RH2eRkuUQwizvlHYY57arZFzt2DOiJWzwQ== X-Received: by 2002:a17:903:1a6f:b0:2b7:975c:dacc with SMTP id d9443c01a7336-2c6f340c78cmr24421195ad.1.1781781088169; Thu, 18 Jun 2026 04:11:28 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c42f1f0f19sm196384565ad.10.2026.06.18.04.11.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2026 04:11:27 -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 75/78] ASoC: codecs: wm8994: Use guard() for mutex locks Date: Thu, 18 Jun 2026 18:08:24 +0700 Message-ID: <20260618110827.232983-19-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_041129_377080_7308C808 X-CRM114-Status: GOOD ( 12.52 ) 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/wm8994.c | 51 +++++++++++++++------------------------ 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 1d64c7c42ed1..58f18bb0057e 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -766,7 +766,7 @@ static void active_reference(struct snd_soc_component *component) { struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component); - mutex_lock(&wm8994->accdet_lock); + guard(mutex)(&wm8994->accdet_lock); wm8994->active_refcount++; @@ -775,8 +775,6 @@ static void active_reference(struct snd_soc_component *component) /* If we're using jack detection go into audio mode */ wm1811_jackdet_set_mode(component, WM1811_JACKDET_MODE_AUDIO); - - mutex_unlock(&wm8994->accdet_lock); } static void active_dereference(struct snd_soc_component *component) @@ -784,7 +782,7 @@ static void active_dereference(struct snd_soc_component *component) struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component); u16 mode; - mutex_lock(&wm8994->accdet_lock); + guard(mutex)(&wm8994->accdet_lock); wm8994->active_refcount--; @@ -800,8 +798,6 @@ static void active_dereference(struct snd_soc_component *component) wm1811_jackdet_set_mode(component, mode); } - - mutex_unlock(&wm8994->accdet_lock); } static int clk_sys_event(struct snd_soc_dapm_widget *w, @@ -3704,7 +3700,7 @@ static void wm8958_open_circuit_work(struct work_struct *work) open_circuit_work.work); struct device *dev = wm8994->wm8994->dev; - mutex_lock(&wm8994->accdet_lock); + guard(mutex)(&wm8994->accdet_lock); wm1811_micd_stop(wm8994->hubs.component); @@ -3718,8 +3714,6 @@ static void wm8958_open_circuit_work(struct work_struct *work) snd_soc_jack_report(wm8994->micdet[0].jack, 0, wm8994->btn_mask | SND_JACK_HEADSET); - - mutex_unlock(&wm8994->accdet_lock); } static void wm8958_mic_id(void *data, u16 status) @@ -3785,27 +3779,25 @@ static void wm1811_mic_work(struct work_struct *work) snd_soc_dapm_sync(dapm); } - mutex_lock(&wm8994->accdet_lock); - - dev_dbg(component->dev, "Starting mic detection\n"); + scoped_guard(mutex, &wm8994->accdet_lock) { + dev_dbg(component->dev, "Starting mic detection\n"); - /* Use a user-supplied callback if we have one */ - if (wm8994->micd_cb) { - wm8994->micd_cb(wm8994->micd_cb_data); - } else { - /* - * Start off measument of microphone impedence to find out - * what's actually there. - */ - wm8994->mic_detecting = true; - wm1811_jackdet_set_mode(component, WM1811_JACKDET_MODE_MIC); + /* Use a user-supplied callback if we have one */ + if (wm8994->micd_cb) { + wm8994->micd_cb(wm8994->micd_cb_data); + } else { + /* + * Start off measument of microphone impedence to find out + * what's actually there. + */ + wm8994->mic_detecting = true; + wm1811_jackdet_set_mode(component, WM1811_JACKDET_MODE_MIC); - snd_soc_component_update_bits(component, WM8958_MIC_DETECT_1, - WM8958_MICD_ENA, WM8958_MICD_ENA); + snd_soc_component_update_bits(component, WM8958_MIC_DETECT_1, + WM8958_MICD_ENA, WM8958_MICD_ENA); + } } - mutex_unlock(&wm8994->accdet_lock); - pm_runtime_put(component->dev); } @@ -4028,11 +4020,8 @@ static void wm8958_mic_work(struct work_struct *work) pm_runtime_get_sync(component->dev); - mutex_lock(&wm8994->accdet_lock); - - wm8994->mic_id_cb(wm8994->mic_id_cb_data, wm8994->mic_status); - - mutex_unlock(&wm8994->accdet_lock); + scoped_guard(mutex, &wm8994->accdet_lock) + wm8994->mic_id_cb(wm8994->mic_id_cb_data, wm8994->mic_status); pm_runtime_put(component->dev); } -- 2.43.0