From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f169.google.com (mail-dy1-f169.google.com [74.125.82.169]) (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 73257404BFF for ; Wed, 17 Jun 2026 10:37:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692634; cv=none; b=rEzN8+e87WiLmjBQMmhT/L7UGZ15dJOyk2+nVfQPKBIZtwtGWINERbItQW4R+6PuT2r0RuF7Av67eSU6qKOqrklIwBqE2cQvKM7TczdBdjr/5EoYcRwUryahwt45IIYCaHlah+1QtaRZZxyGBKlAJEQnAJfksDspn0h80qK9q0E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692634; c=relaxed/simple; bh=6JGmkvmPv3bfeFK1z8LiLk2AYl5VVZRgiOOlTyfPPvU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sOGQZLqjc5zFK2UB3fuYrky5dZCDiG1fGvPPQ/v/5DAynrDojTgKUTB5odYRQ9reejidJVuMmRTgkQcsMnH84gg4e2o8R843ZGnS4n+n55ibVHVcTHT61qdD96UlYAGtCggYtvx2nAGa31X9J+Rnp5D06JItWaPOw0cvxiwEv9g= 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=Jki8DKIv; arc=none smtp.client-ip=74.125.82.169 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="Jki8DKIv" Received: by mail-dy1-f169.google.com with SMTP id 5a478bee46e88-30bbe98c3f0so2724119eec.0 for ; Wed, 17 Jun 2026 03:37:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692628; x=1782297428; 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; bh=xcitmHPXdjwjVBCqMlXK3p8pn3Z3237U4G8SnuErAoU=; b=Jki8DKIvwzfcZYFPY37grUmia4Mo8LGurvsEPlPd8pelHo+xFrVLjINFn2dahluMkV hAGv62N0nv7hHM37GMM0NBVKMq1IABx4k4uIK92urqPeJCqYUF++G4wN7f43AGGzaZK0 QKd9r5NAR55YBovhCtJ8mojuNRXErczwEzuYcGJ9s8fOiRLhstrGnlbSUhWEM88r5jrH 5AKuMsXGYBdgwQ2B2zIyuH44aBI2RVeActsFOExOTtYPeLzL+4rxYF7zjYuYYjIG3FRt fsLk5bwLvtTMzUjy6wRhQy1XK6yNUNSSPsDlOAe0MbSIuMqeXgBnPpn+AC+oZt30Dhkw d2CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692628; x=1782297428; 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=xcitmHPXdjwjVBCqMlXK3p8pn3Z3237U4G8SnuErAoU=; b=c2ejdbabtPYSOHDPAh5L/b3Ej75jznGcE8Lf7If+4XDFhNnvjsGt4YNNOth6S5GqRU 38DxiH33amCu+5//T6KLGE3ww/UISQlKvwedjLnr0SANcD/tjpS2uyTqiR2eLsramgj6 3zZ9nOkLW/etv7VIIMLVmHzPh2tmUwIOrgo3z6woiHdk5wVNTC8rgmMZTZqdcxhEOBWF FSv8WVkwvKXbC/1Dcz/72qYGeCnWoylGsHLlk5hXS9hjWhAYozJCKaToFecilOa0T33U YnA3ZSRQzZ73reSVe3JLtWq3F1+Yc7qN4eJ/XccPywOKA9Hubpc67kj5abj1o72q5xDn ZXtw== X-Forwarded-Encrypted: i=1; AFNElJ+JI1K+gwy6lR+PwFkE5ya3xXRWZqtgkBJyXKvWvLo/3r4e70jZyjNIfrPUII7bR+HOynkzgg5COesDGyw=@vger.kernel.org X-Gm-Message-State: AOJu0YxVBNpIzJ6JFRomuTtVU0Me9KCW90IIbV+2KGQ2oDSnpoQQnLgf 4Ucnq8ICtgL1ORJNor66YhAeoI1IdshNzFgYjcfGyGF0/lG+nl85VWZM X-Gm-Gg: AfdE7cnnMJsTLK1/P6IHXisLlDg/jCHjGFRuPgk0JNHuxWCY5ptWEYUwGpYfJGWczxx DC0dWgEbw/KwA+W634mvUywlUlm9DN7ea1LJXY8acEK1RxLCAGjB8uQz50T040DWochcC2wQrrf QYCM1XV7MqyD1MgLCrpYUQJOWMbm+ttZ93mjGNAvl2N8jJbyL9JVdwSytWBnQP/dJpp1yQ/SVNy 1b8k/2eIUt8VUqWPpXh2Y3HJTUCI+sBXix1LHFtmk+7011sZukQenvEzMRp2POVfPVaIxazukWQ m4LyDwmQmKL4pcqDJUL64El1aHv1M6LQrZNMPVggr4HURBORWTo+ZF3An6qRDmvLeBFL5a4PR12 HV8A5B4tHwRvMgjULzfcAPKLonMDGQhwV+3WYMvafuD4WBuSJT5khPJLwSiJamR+jrsN9w+FmXt zMSKJ4sCj286xR7xhplyN6GdmQyCC//SE5meZ6fjmGeDQiaPw= X-Received: by 2002:a05:7300:4313:b0:2d1:d434:cfe3 with SMTP id 5a478bee46e88-30bc92019d6mr1607108eec.0.1781692628170; Wed, 17 Jun 2026 03:37:08 -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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:37:07 -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 27/78] ASoC: codecs: es8316: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:31:44 +0700 Message-ID: <20260617103235.449609-28-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> Precedence: bulk X-Mailing-List: linux-kernel@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/es8316.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c index 6a428387e496..df6cf8a19270 100644 --- a/sound/soc/codecs/es8316.c +++ b/sound/soc/codecs/es8316.c @@ -621,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; @@ -682,8 +682,6 @@ static irqreturn_t es8316_irq(int irq, void *data) } } -out: - mutex_unlock(&es8316->lock); return IRQ_HANDLED; } @@ -700,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); @@ -727,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); @@ -738,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