Linux Sound subsystem development
 help / color / mirror / Atom feed
From: phucduc.bui@gmail.com
To: Mark Brown <broonie@kernel.org>, Takashi Iwai <tiwai@suse.com>,
	Tzung-Bi Shih <tzungbi@kernel.org>,
	David Rhodes <david.rhodes@cirrus.com>,
	Charles Keepax <ckeepax@opensource.cirrus.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>,
	Jaroslav Kysela <perex@perex.cz>,
	Cheng-Yi Chiang <cychiang@chromium.org>,
	Guenter Roeck <groeck@chromium.org>,
	Benson Leung <bleung@chromium.org>,
	Richard Fitzgerald <rf@opensource.cirrus.com>,
	povik+lin@cutebit.org, linux-sound@vger.kernel.org,
	linux-kernel@vger.kernel.org, patches@opensource.cirrus.com,
	chrome-platform@lists.linux.dev, asahi@lists.linux.dev,
	bui duc phuc <phucduc.bui@gmail.com>
Subject: [PATCH 13/24] ASoC: codecs: cs35l56: Use guard() and PM runtime scope helpers
Date: Fri, 26 Jun 2026 13:13:18 +0700	[thread overview]
Message-ID: <20260626061329.23264-14-phucduc.bui@gmail.com> (raw)
In-Reply-To: <20260626061329.23264-1-phucduc.bui@gmail.com>

From: bui duc phuc <phucduc.bui@gmail.com>

Convert the interrupt handler to use guard(mutex) for automatic mutex
unlocking and PM_RUNTIME_ACQUIRE_IF_ENABLED() to manage the runtime PM
reference through scope-based cleanup.
This removes the explicit cleanup paths while preserving the existing
behavior.

Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
---
 sound/soc/codecs/cs35l56-shared.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c
index f14e2eaaa4ee..73fe1cba3f5b 100644
--- a/sound/soc/codecs/cs35l56-shared.c
+++ b/sound/soc/codecs/cs35l56-shared.c
@@ -645,18 +645,19 @@ irqreturn_t cs35l56_irq(int irq, void *data)
 	if (!cs35l56_base->init_done)
 		return IRQ_NONE;
 
-	mutex_lock(&cs35l56_base->irq_lock);
+	guard(mutex)(&cs35l56_base->irq_lock);
 
-	rv = pm_runtime_resume_and_get(cs35l56_base->dev);
+	PM_RUNTIME_ACQUIRE_IF_ENABLED(cs35l56_base->dev, pm);
+	rv = PM_RUNTIME_ACQUIRE_ERR(&pm);
 	if (rv < 0) {
 		dev_err(cs35l56_base->dev, "irq: failed to get pm_runtime: %d\n", rv);
-		goto err_unlock;
+		return ret;
 	}
 
 	regmap_read(cs35l56_base->regmap, CS35L56_IRQ1_STATUS, &val);
 	if ((val & CS35L56_IRQ1_STS_MASK) == 0) {
 		dev_dbg(cs35l56_base->dev, "Spurious IRQ: no pending interrupt\n");
-		goto err;
+		return ret;
 	}
 
 	/* Ack interrupts */
@@ -680,7 +681,7 @@ irqreturn_t cs35l56_irq(int irq, void *data)
 
 	/* Check to see if unmasked bits are active */
 	if (!status1 && !status8 && !status20)
-		goto err;
+		return ret;
 
 	if (status1 & CS35L56_AMP_SHORT_ERR_EINT1_MASK)
 		dev_crit(cs35l56_base->dev, "Amp short error\n");
@@ -688,14 +689,8 @@ irqreturn_t cs35l56_irq(int irq, void *data)
 	if (status8 & CS35L56_TEMP_ERR_EINT1_MASK)
 		dev_crit(cs35l56_base->dev, "Overtemp error\n");
 
-	ret = IRQ_HANDLED;
+	return IRQ_HANDLED;
 
-err:
-	pm_runtime_put(cs35l56_base->dev);
-err_unlock:
-	mutex_unlock(&cs35l56_base->irq_lock);
-
-	return ret;
 }
 EXPORT_SYMBOL_NS_GPL(cs35l56_irq, "SND_SOC_CS35L56_SHARED");
 
-- 
2.43.0


  parent reply	other threads:[~2026-06-26  6:15 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-26  6:13 [PATCH 00/24] ASoC: codecs: Use guard() for mutex & spin locks phucduc.bui
2026-06-26  6:13 ` [PATCH 01/24] ASoC: codecs: ab8500: Use guard() for mutex locks phucduc.bui
2026-06-26  6:13 ` [PATCH 02/24] ASoC: codecs: ak4613: " phucduc.bui
2026-06-26  6:13 ` [PATCH 03/24] ASoC: codecs: arizona-jack: Use guard() cleanup helpers phucduc.bui
2026-06-26 12:06   ` Charles Keepax
2026-06-26  6:13 ` [PATCH 04/24] ASoC: codecs: arizona: Use guard() for mutex locks phucduc.bui
2026-06-26 10:40   ` Charles Keepax
2026-06-26  6:13 ` [PATCH 05/24] ASoC: codecs: aw87390: " phucduc.bui
2026-06-26  6:13 ` [PATCH 06/24] ASoC: codecs: aw88081: " phucduc.bui
2026-06-26  6:13 ` [PATCH 07/24] ASoC: codecs: aw88166: " phucduc.bui
2026-06-26  6:13 ` [PATCH 08/24] ASoC: codecs: aw88261: " phucduc.bui
2026-06-26  6:13 ` [PATCH 09/24] ASoC: codecs: aw88395: " phucduc.bui
2026-06-26  6:13 ` [PATCH 10/24] ASoC: codecs: aw88399: " phucduc.bui
2026-06-26  6:13 ` [PATCH 11/24] ASoC: codecs: cros_ec_codec: " phucduc.bui
2026-06-26  6:13 ` [PATCH 12/24] ASoC: codecs: cs-amp-lib: " phucduc.bui
2026-06-26  8:47   ` Richard Fitzgerald
2026-06-26  9:36     ` Bui Duc Phuc
2026-06-26  6:13 ` phucduc.bui [this message]
2026-06-26  6:13 ` [PATCH 14/24] ASoC: codecs: cs42l42: Use guard() cleanup helpers phucduc.bui
2026-06-26 12:18   ` Charles Keepax
2026-06-26  6:13 ` [PATCH 15/24] ASoC: codecs: cs42l43: Use guard() and PM runtime scope helpers phucduc.bui
2026-06-26 10:56   ` Charles Keepax
2026-06-26 12:57     ` Bui Duc Phuc
2026-06-26  6:13 ` [PATCH 16/24] ASoC: codecs: cs42l84: Use guard() for mutex locks phucduc.bui
2026-06-26 10:58   ` Charles Keepax
2026-06-26  6:13 ` [PATCH 17/24] ASoC: codecs: cs43130: " phucduc.bui
2026-06-26  6:13 ` [PATCH 18/24] ASoC: codecs: cs47l15: " phucduc.bui
2026-06-26 12:02   ` Charles Keepax
2026-06-26  6:13 ` [PATCH 19/24] ASoC: codecs: cs47l35: " phucduc.bui
2026-06-26 12:03   ` Charles Keepax
2026-06-26  6:13 ` [PATCH 20/24] ASoC: codecs: cs47l85: " phucduc.bui
2026-06-26 12:03   ` Charles Keepax
2026-06-26  6:13 ` [PATCH 21/24] ASoC: codecs: cs47l90: " phucduc.bui
2026-06-26 12:03   ` Charles Keepax
2026-06-26  6:13 ` [PATCH 22/24] ASoC: codecs: cs47l92: " phucduc.bui
2026-06-26 12:04   ` Charles Keepax
2026-06-26  6:13 ` [PATCH 23/24] ASoC: codecs: cs48l32: " phucduc.bui
2026-06-26 12:15   ` Charles Keepax
2026-06-26  6:13 ` [PATCH 24/24] ASoC: codecs: cs2072x: " phucduc.bui

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260626061329.23264-14-phucduc.bui@gmail.com \
    --to=phucduc.bui@gmail.com \
    --cc=asahi@lists.linux.dev \
    --cc=bleung@chromium.org \
    --cc=broonie@kernel.org \
    --cc=chrome-platform@lists.linux.dev \
    --cc=ckeepax@opensource.cirrus.com \
    --cc=cychiang@chromium.org \
    --cc=david.rhodes@cirrus.com \
    --cc=groeck@chromium.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=patches@opensource.cirrus.com \
    --cc=perex@perex.cz \
    --cc=povik+lin@cutebit.org \
    --cc=rf@opensource.cirrus.com \
    --cc=tiwai@suse.com \
    --cc=tzungbi@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox