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 62626C4451C for ; Tue, 21 Jul 2026 10:26:48 +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=8FKz6zL2lYGruFgrXSmVh8CpNcaMm/DKeCPXfcKM2u4=; b=H+tHNDVC27kNM3OAPgXaAZpEfu 71OYjqGg4G94K1P+2CiXS859jj6rEJYdlsV140kGcvdMjJNvOCcWTbqy7AX072Im73/g2+LKetkR1 PpO7uxiz/9vTq/lJiqmFYMMGFUZk7q5m80hbi1fP2qwXctwHR3IXVtyF4oBH4Kfr1Cy3KzOtkLFHC ZZJ7rQfzMX9A26mzDj9jWZDoQos0355mHC27alBlEg4WFGEPIVVFxdau/gGlTZS1WYw7JKihFBKkK pXmEUDozr7OlLGjwmEiVkJUTDZQU2702SlxC91FryOFJ9yOhBABj9JtWhs7P4M2ao63MXlJsvgwtt IQkVbn+A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wm7gV-00000009841-2b4Q; Tue, 21 Jul 2026 10:26:47 +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 1wm7gS-0000000981y-42BF for linux-mediatek@lists.infradead.org; Tue, 21 Jul 2026 10:26:46 +0000 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2caea3f742bso132662715ad.0 for ; Tue, 21 Jul 2026 03:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784629604; x=1785234404; 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:content-type; bh=8FKz6zL2lYGruFgrXSmVh8CpNcaMm/DKeCPXfcKM2u4=; b=AZod8jN1eezgkmaiZhcwFT5BV+xOllEDCCxvG6zTEBh5aRiow5oQXB1mwjMbw9HRqT UNqnspjhLY1CLnd1lwZVEUV4xqhLJ6p4ajykRYlK6H2v7hWFqV+UQU9LpkEkjx0UMede grh5pli9YwshNOiOnJ5H3AzFuue+L2zGx0ztNbtM6T+XylzMs1YS6bhbtOZJMcvxkYpY oYVsr7+wi9xFKlQ+COnQlvenc7RSREPSMyGAnMxMhHA2qfezYNJTD08eXmJiUElGDryX kqnBTPoNnS0fALCy1+seWMKBVsrAnHcMPGfe8v/04DCGXeXD1MsuBSoDff9UIOseu2YA nJmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784629604; x=1785234404; 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=8FKz6zL2lYGruFgrXSmVh8CpNcaMm/DKeCPXfcKM2u4=; b=N9e8TnhTAJArdv2z0AVC0ACauHWzM7vYO7zpWBtkuWhd3cms/0KZu3tNz0afngyiKj 3GZLfOdRUm4lxxoTLPWjLW+9R3ERoLbavcz4+LyuQYDePIMPOH663pgTmtMIG31kzLJ3 8RknKodgat6TTF/sQcr09MGkCh3TY+PzchjWLMu7QmwkHUGx4It06qLLGxooIfwKsgPe Go8Zsi4ZcNsguFM7NJ5aBGdkRub+GXGugPMptX9f/Ghp7fTWO8Rvvpv7wkuBIcQL1rEu 8cUCF1M1Qq2yEfjmD5dAyfx06A3TLcS6s3shMa0V/8hQvbZMK47BPW/Q+kzyKQk6E0SZ g23w== X-Forwarded-Encrypted: i=1; AHgh+RqqjDWepcAtgvjPBRU7PYNfydQ0M3xU1Ys0ijuKhg4h0/GNg0E/4DYEAmCL+giE6rIzlikrMVaGW0gTXu+wig==@lists.infradead.org X-Gm-Message-State: AOJu0YxZnWRZWfPOvBjazSqTdeRGD8JAf6Hw+mKEHSNpLUKagiflURwd cVT6GMLaCVsuJQAFUpPeM4Ei+lkvVOpcTcASkDjFs2ZSkdzXmHHW0RRn X-Gm-Gg: AR+sD11Fyt7ItONrSuJmEpZDqYAWS/xiS7olw2+edZ1eBMhgu1lCY9pwQUpVhldb1Hd gUMhzrfyRv54DXVRyyPfd7dORxiHuv4rL74osmZLoVJRGyGMkYFjoQEJWoedbd5coPGLSVsaXWw 5wmGTHlxrtINS5P7isHitXB1haA24uwIX1bEG3O58rzdzrYMi2lUWHs6qaxALj0FFfXgZqkP5LE ksipj9F76kRgYlyKpSCInzFgyG7Qwzl3BfUAvmWqS/ETlUWBhInRMEByzzozw2WtycZExT7UGXV qDhf4tkzw+9Pn2VlXKtZxNqO82UNrK2mQu02mIDmSz4rlrx7iltjTe/XwHmF/tSMzzPm9lFLthZ WlcQuG4tgajQVWO9Hc7Nfw61CvQ4l/krQZGoPewcBXnEoNK4VTntPyhjJETczrqyFHz89ygQgT9 xQYpNAiOYQjjTcxzDh6T8pHosJzKen1+tHnvMw X-Received: by 2002:a17:903:1b0e:b0:2ca:73aa:b48f with SMTP id d9443c01a7336-2cf34a48f7fmr193973625ad.35.1784629604317; Tue, 21 Jul 2026 03:26:44 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf3448dac2sm73581365ad.3.2026.07.21.03.26.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 03:26:44 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Takashi Iwai , Nick Li , Herve Codina Cc: Support Opensource , Liam Girdwood , Jaroslav Kysela , Srinivas Kandagatla , Charles Keepax , Richard Fitzgerald , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Linus Walleij , Kuninori Morimoto , u.kleine-koenig@baylibre.com, Zhang Yi , Marco Crivellari , Kees Cook , HyeongJun An , Arnd Bergmann , Qianfeng Rong , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bui duc phuc Subject: [PATCH v4 03/29] ASoC: codecs: es8316: Use guard() for mutex locks Date: Tue, 21 Jul 2026 17:25:34 +0700 Message-ID: <20260721102600.523199-4-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260721102600.523199-1-phucduc.bui@gmail.com> References: <20260721102600.523199-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-20260721_032645_047350_29D09BF3 X-CRM114-Status: GOOD ( 14.18 ) 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/es8316.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c index 3abe77423f29..87f331868dc7 100644 --- a/sound/soc/codecs/es8316.c +++ b/sound/soc/codecs/es8316.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -620,15 +621,15 @@ static irqreturn_t es8316_irq(int irq, void *data) struct snd_soc_component *comp = es8316->component; unsigned int flags; - mutex_lock(&es8316->lock); + guard(mutex)(&es8316->lock); regmap_read(es8316->regmap, ES8316_GPIO_FLAG, &flags); if (flags == 0x00) - goto out; /* Powered-down / reset */ + return IRQ_HANDLED; /* Powered-down / reset */ /* Catch spurious IRQ before set_jack is called */ if (!es8316->jack) - goto out; + return IRQ_HANDLED; if (es8316->jd_inverted) flags ^= ES8316_GPIO_FLAG_HP_NOT_INSERTED; @@ -681,8 +682,6 @@ static irqreturn_t es8316_irq(int irq, void *data) } } -out: - mutex_unlock(&es8316->lock); return IRQ_HANDLED; } @@ -699,18 +698,16 @@ static void es8316_enable_jack_detect(struct snd_soc_component *component, es8316->jd_inverted = device_property_read_bool(component->dev, "everest,jack-detect-inverted"); - mutex_lock(&es8316->lock); + scoped_guard(mutex, &es8316->lock) { + es8316->jack = jack; - es8316->jack = jack; - - if (es8316->jack->status & SND_JACK_MICROPHONE) - es8316_enable_micbias_for_mic_gnd_short_detect(component); - - snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE, - ES8316_GPIO_ENABLE_INTERRUPT, - ES8316_GPIO_ENABLE_INTERRUPT); + if (es8316->jack->status & SND_JACK_MICROPHONE) + es8316_enable_micbias_for_mic_gnd_short_detect(component); - mutex_unlock(&es8316->lock); + snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE, + ES8316_GPIO_ENABLE_INTERRUPT, + ES8316_GPIO_ENABLE_INTERRUPT); + } /* Enable irq and sync initial jack state */ enable_irq(es8316->irq); @@ -726,7 +723,7 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component) disable_irq(es8316->irq); - mutex_lock(&es8316->lock); + guard(mutex)(&es8316->lock); snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE, ES8316_GPIO_ENABLE_INTERRUPT, 0); @@ -737,8 +734,6 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component) } es8316->jack = NULL; - - mutex_unlock(&es8316->lock); } static int es8316_set_jack(struct snd_soc_component *component, -- 2.43.0