From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (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 6A0E627A477 for ; Tue, 30 Jun 2026 06:35:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801335; cv=none; b=TR8vCa835aXZo5LFko1z4/4wR7t4XHHq+OeFA90tWfPsz9CS6uyawQ414lWKTQwWpl/FGX79WrQszzmWK28BhH9CvCkdBovZ8oOuv/tsK+QWmJSf1uMfbeYPharF2FUkXv9h6RLqVdLP10ayQ1p5EmZ+vyR5M4RBP4TEkg7B0/M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801335; c=relaxed/simple; bh=vGG3xbNRD9aTcWhmHrqO23PJ1N/lJS4R0ZsiliefWlE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rmdI3uxkVg3fr6Vn7T9eWS2Dl0t1aAkInT0b+L0fWM0apg9SKvCd09IOYm2pO/eGk+dtgbBIMrefdiFdQKEVOMAtY1pae9xMpOxYmKYgH4EsBTtYnI3wFB1eK79LkwUn4NoDVv/QFqnfrNui7l2COZF01ayvjicefl0PtUMPA48= 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=iikW7/XF; arc=none smtp.client-ip=209.85.215.177 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="iikW7/XF" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-c96b08cdd1cso854477a12.0 for ; Mon, 29 Jun 2026 23:35:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801330; x=1783406130; 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=RozeYceB4iwycNfbGDK46tH90J5JBru51kfxpqOiyNk=; b=iikW7/XFxMIYt2zCfY1OKO1XlDleR5pTxxM21X07QOl+ZdDlfS6BXSg2guTIYNIXAw vE7GvrjRwKPyoGBUigc/itaSuDgOubzczDdsw/q8czzxTFbSBG2FkJb0J/XoLD0y+gYL V/unBJJctmC3eL9xiV4k5QBMRvdqsOuT/G7afHnlj/4L4d+If8vvHQ+uRB7tXo4ouxVf US6NqYj78nKeNnHweZ09MwwnBgP6VzB5SBB2kJU3XPVWLUSso0nu5Yyt7NZEM4wA3Kzp NvbukxgTcBFShxwHLY0fip6Wo4dYyqMg7geyBhdhLn0lBzRh604NpRNSfqTrk2WTyWLH hYMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801330; x=1783406130; 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=RozeYceB4iwycNfbGDK46tH90J5JBru51kfxpqOiyNk=; b=ZY2P7XysN3calArYAxstYEvY4Rs8/ED0BVMu+aRWllGuK2sRfVCd9RHYRbs4C/+pO+ yL9CLXOc3HgSgyNliLBjqe/iAbM5xoLd9GAjxkxuRcVQLgVKZwUsukHCT7VzpjOv+NUj kL3Pui2BEt40Jq49NsXuYQxDHmbKnqb6Jm7LjQ6WvqfdTA/7qRt8Kh3KQNDxWLCDvOSI iG/4LqGCiQ5aCRYJwNsl8pBb0XaDcTQ9BXveZmvchXnWCArq02o1JR9qmMF06cQtJEIV lBJYCCasdXDNRsP/DN/c9SzASuqd5oEMCMHjqxXramfdLgq5G+CqojjgNbKrXoM5UID0 JCbA== X-Forwarded-Encrypted: i=1; AHgh+RqzvG5bX5XfWwY8nk7pbRXB0vrgtNNgDxbGT60O34OmgZByPq1/zd9mxje3hP5vPbdwm4qGLNn7HeRjSHM=@vger.kernel.org X-Gm-Message-State: AOJu0Ywbzk3/ChoQo1nhHrcDu3c/VjVzJddge7uFTlABpTEU+mpz1Rg/ CQye/VNk1uBxaZTJnkO69F+aLq9gw6xi9u4HEXs5NTI5SyqmTPtapL6f X-Gm-Gg: AfdE7cnhUdf1aiis46E55nTyJc6PqH4ndPb6X0LJ+VmbAMyPqVqN2ENKeVrXeBTjj7u giOLdrFpH7jFj1rMgvfXteT25xKbcgQ4T3dEXuL4WaIkj6ZtOSL8HeQCDBPShI6lp9dhF7Pz1yY ZCpT/zFNFMSNjxzVn35eDop1DkEBpz+PsOLFUK+gTiV5NOAT7nqOAVmwHLNm4+EH0x4BX2BZaF+ N8w+D8Yvlua6Lo9ZFDWwKNfMskkwJmQY4Q5cZo8SdkyA6iR5nqSXs4qhZYYzSw0PIzgWwE67fv7 dErn8dziRLQ3td9vYB4Sqhnl7q7S9TWnowuOvwh3JK2z+M9cTd8t6311WcLtS3iehHqojKAQY3P rUO+txzRytCX0esxosIbLMbYW5Yy/KB0+jGY0kPlFXFcU7WdLdJofw2cyUA3UDE6I1Fjwj+TsZM UyRtjA23N3cfTUSlY2hKf/rol+02JU3/RXZBq5bLfVlcsCmxI= X-Received: by 2002:a05:6a00:3d04:b0:845:cf73:c1d8 with SMTP id d2e1a72fcca58-8479f1004f4mr1954813b3a.14.1782801329607; Mon, 29 Jun 2026 23:35:29 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a02cd237sm1165061b3a.32.2026.06.29.23.35.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:35:29 -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 03/27] ASoC: codecs: es8316: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:25 +0700 Message-ID: <20260630063449.503996-4-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260630063449.503996-1-phucduc.bui@gmail.com> References: <20260630063449.503996-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 | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c index 6a428387e496..e83dab0b7083 100644 --- a/sound/soc/codecs/es8316.c +++ b/sound/soc/codecs/es8316.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -621,15 +622,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 +683,6 @@ static irqreturn_t es8316_irq(int irq, void *data) } } -out: - mutex_unlock(&es8316->lock); return IRQ_HANDLED; } @@ -700,18 +699,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 +724,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 +735,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