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 388CCCD98E2 for ; Wed, 17 Jun 2026 10:37:27 +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=RS60dBgVHLJM7xKUP9F+W887F9cI3ycWsKsxpAyWFqA=; b=LKiZ+m0FvTcghgxI4dweD9KcMN eQ67ZEcQWi/s6Pm9WyX+xIHpEySMlM1YfqsbrYZTNtuds32Z92qlfC4eCgTsjgg3D+DDExOehlUhY 7aqYg9q2Ea8jK17sXQXDykYH8dlk7Wn3QOeuxiL42gQd7/oz982un6qCChlFwvD5DPdVm6/Zr2fbk 6ud3gH0JXf7f65kQaYRbdjj5flbFh2C6qBL67wusduh3EqB/QdSZ3Ba3ABMm5MWlxUbCbRjNDdhU0 ybqyWEuaGbJIkr2T90Hg2EAMdfu+1VotBvqqnlcPfXd4kaj68A3IL7MZRfqCyUbKPHCZjP7jreF0+ C5x0JuZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZne4-0000000H6rC-3BM0; Wed, 17 Jun 2026 10:37:20 +0000 Received: from mail-dy1-x1332.google.com ([2607:f8b0:4864:20::1332]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZne1-0000000H6on-3xu2 for linux-arm-kernel@lists.infradead.org; Wed, 17 Jun 2026 10:37:19 +0000 Received: by mail-dy1-x1332.google.com with SMTP id 5a478bee46e88-30be4a661aeso104248eec.0 for ; Wed, 17 Jun 2026 03:37:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692637; x=1782297437; 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=RS60dBgVHLJM7xKUP9F+W887F9cI3ycWsKsxpAyWFqA=; b=btAyXQ4eHV8La8FlX/WUcfN3j2IMFQ2ZlXLPPdy5VLJhaRHPU1Oj6jeu5HfwIk+pUu Vkwu1iPKVQb+29R/uxVHmPc2KU9xULBXZ7FnGsU+oIjaTE5K4dJfWkXHfq2i/MbZh9qe YXFGKl1hqj6dmo2RLr2ixTZSQeiFt4II07qDqXAu53+QesIWDV7Lz0al9vDjy9i0ZJOg uadE4RreqpmMX57VcL+9hEGeLREKDCuopLiXGN3+VXI5Nsr9C6R32QW3xaf8fMb8w2RH /XTUg757QidGNgVI8fVbCGvHB29QcUftTo64k1XC1n/DMKC/ZSDuxC5sf0gfKh0u5xJX FfZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692637; x=1782297437; 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=RS60dBgVHLJM7xKUP9F+W887F9cI3ycWsKsxpAyWFqA=; b=EOttgjakCmy4rYwPCggLm+lpbrGug9baaFZYJCD3I2Frf9hpauJ1PZBbrOJKVuwMRI HdpwWgGOnhdFNvApZX4/bW0/cM8Ek1gj5UvKVQ3K8jKcy7PDdhZ+1Pe+kcF3h7GetMFr esd2ePUB6/oqe93+2O1opcE0L3UyC+kORWbpUTwqug4xplB6bhVIRuDcCjH1IruuRA4j i/T+OsprSO5P9psGQOeGn46mSz2pPiveL+lLsq09GsLkUeE0nWq08xUdMzhGu95vWrmE yrnfk767uq6W3ZR1esHKUvHFj7IMd21df4XypbJFstzeGQlrzb97/4Kg0zrIdwIJYK9F g+Bg== X-Forwarded-Encrypted: i=1; AFNElJ85PIMmUok53gFtgxaoDT/q4NtNNKY3B6AYIXfUmCkrUhhvv1OaNvABfDV3vLeeCC81+80ZZ99pnF8fUaMC0nCQ@lists.infradead.org X-Gm-Message-State: AOJu0Yywc+/7ZzdhfZJhMqtWCwGbtEhzVKj4mjGN+p8p8Vg/aI/NpPd7 mlsrzxmhHCyvL44tLmIjqRgy/f7HffBZTiSWiRGs0ir6jP/L7qaUvQCk X-Gm-Gg: AfdE7cm9Y8LxccxibdDLK3S5vaaeF1Szv7TEmGC4pqGEoiaMNVWOos2qjoOeX0KkWlI VF57Vh4YiWFCpUCxhBvZdfY5geqmdWEOGxFjEFoTq3c8aFUNQFW6mKcNkSQB3f6/fIzbAo0qOeP NWfL+abKKwmVskINHbtDk2/uGkXMrx+Cv1O+sDsqkAfmsu2gHR1xqsRYJ/9wP3Ez+4IfG1bR6iz gPXiDKhru+vYUBks+v8jYsV3mHfJ/q8SJRDG9Y4sbsbmSLYsygEO+8wRocEd0ElfihKTcWxcw3Z qQV/mTPe3eUDlI601o8GL0cbCqkEIPT8LA/S+zN11fJ4fpGVwo84SHqm+FP8JT0hYqAVk3WbAlU AnCivaVmt/NBjicVwr9FoaPQhwS789GMyPD3aM1o5xprBvv1fRihbrzLgxHFMGrjSRGHY0lVy8f L1k6a9oxU2vFl36CxRgxsyg6FitHY9JSOkmaG1gXMYbZGhdvU= X-Received: by 2002:a05:7300:7481:b0:30b:bf5c:c878 with SMTP id 5a478bee46e88-30bca067e13mr1803295eec.25.1781692637212; Wed, 17 Jun 2026 03:37:17 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d0828sm24616275eec.10.2026.06.17.03.37.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:37:16 -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 28/78] ASoC: codecs: es8326: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:31:45 +0700 Message-ID: <20260617103235.449609-29-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260617103235.449609-1-phucduc.bui@gmail.com> References: <20260617103235.449609-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-20260617_033717_991517_44029F17 X-CRM114-Status: GOOD ( 13.39 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=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/es8326.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/sound/soc/codecs/es8326.c b/sound/soc/codecs/es8326.c index a79b2da35099..4aaae6eab7f2 100644 --- a/sound/soc/codecs/es8326.c +++ b/sound/soc/codecs/es8326.c @@ -790,7 +790,7 @@ static void es8326_jack_button_handler(struct work_struct *work) if (!(es8326->jack->status & SND_JACK_HEADSET)) /* Jack unplugged */ return; - mutex_lock(&es8326->lock); + guard(mutex)(&es8326->lock); iface = snd_soc_component_read(comp, ES8326_HPDET_STA); switch (iface) { case 0x93: @@ -845,7 +845,6 @@ static void es8326_jack_button_handler(struct work_struct *work) } es8326_disable_micbias(es8326->component); } - mutex_unlock(&es8326->lock); } static void es8326_jack_detect_handler(struct work_struct *work) @@ -855,7 +854,7 @@ static void es8326_jack_detect_handler(struct work_struct *work) struct snd_soc_component *comp = es8326->component; unsigned int iface; - mutex_lock(&es8326->lock); + guard(mutex)(&es8326->lock); iface = snd_soc_component_read(comp, ES8326_HPDET_STA); dev_dbg(comp->dev, "gpio flag %#04x", iface); @@ -873,7 +872,7 @@ static void es8326_jack_detect_handler(struct work_struct *work) regmap_update_bits(es8326->regmap, ES8326_HPDET_TYPE, ES8326_HP_DET_JACK_POL, (es8326->jd_inverted ? ~es8326->jack_pol : es8326->jack_pol)); - goto exit; + return; } if ((iface & ES8326_HPINSERT_FLAG) == 0) { @@ -930,7 +929,7 @@ static void es8326_jack_detect_handler(struct work_struct *work) queue_delayed_work(system_dfl_wq, &es8326->jack_detect_work, msecs_to_jiffies(400)); es8326->hp = 1; - goto exit; + return; } if (es8326->jack->status & SND_JACK_HEADSET) { /* detect button */ @@ -939,7 +938,7 @@ static void es8326_jack_detect_handler(struct work_struct *work) (ES8326_INT_SRC_PIN9 | ES8326_INT_SRC_BUTTON)); es8326_enable_micbias(es8326->component); queue_delayed_work(system_dfl_wq, &es8326->button_press_work, 10); - goto exit; + return; } if ((iface & ES8326_HPBUTTON_FLAG) == 0x01) { dev_dbg(comp->dev, "Headphone detected\n"); @@ -958,8 +957,6 @@ static void es8326_jack_detect_handler(struct work_struct *work) usleep_range(10000, 15000); } } -exit: - mutex_unlock(&es8326->lock); } static irqreturn_t es8326_irq(int irq, void *dev_id) @@ -1200,13 +1197,12 @@ static void es8326_enable_jack_detect(struct snd_soc_component *component, { struct es8326_priv *es8326 = snd_soc_component_get_drvdata(component); - mutex_lock(&es8326->lock); - if (es8326->jd_inverted) - snd_soc_component_update_bits(component, ES8326_HPDET_TYPE, - ES8326_HP_DET_JACK_POL, ~es8326->jack_pol); - es8326->jack = jack; - - mutex_unlock(&es8326->lock); + scoped_guard(mutex, &es8326->lock) { + if (es8326->jd_inverted) + snd_soc_component_update_bits(component, ES8326_HPDET_TYPE, + ES8326_HP_DET_JACK_POL, ~es8326->jack_pol); + es8326->jack = jack; + } es8326_irq(es8326->irq, es8326); } @@ -1219,13 +1215,12 @@ static void es8326_disable_jack_detect(struct snd_soc_component *component) return; /* Already disabled (or never enabled) */ cancel_delayed_work_sync(&es8326->jack_detect_work); - mutex_lock(&es8326->lock); + guard(mutex)(&es8326->lock); if (es8326->jack->status & SND_JACK_MICROPHONE) { es8326_disable_micbias(component); snd_soc_jack_report(es8326->jack, 0, SND_JACK_HEADSET); } es8326->jack = NULL; - mutex_unlock(&es8326->lock); } static int es8326_set_jack(struct snd_soc_component *component, -- 2.43.0