Skip to contentSkip to conversation

ASoC: Fix mixed goto and guard() usage

PATCH In review [email protected] 2 participants 4 messages Jul 1 – Jul 3

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover ASoC: Fix mixed goto and guard() usage

From: bui duc phuc <[email protected]>

Hi all,

These two patches fix the remaining cases of mixed goto-based error handling and cleanup helpers introduced by the recent guard() conversion patches that have already been merged for the 7.2 development cycle.

The cleanup.h guidelines explicitly recommend not mixing goto with cleanup helpers in the same function. Only two functions were left in this state:

- sound/soc/samsung/i2s.c: remove the goto-based error path and rely on guard(pm_runtime) for automatic cleanup.
- sound/soc/ti/j721e-evm.c: restore mutex_lock()/mutex_unlock() to preserve the existing goto-based error handling.

Although these cases do not trigger any build warnings or errors with Clang (W=1), they still violate the cleanup.h guidelines. These patches address those remaining cases and add the appropriate Fixes:
tags for the commits that introduced them.

Best regards,
Phuc

bui duc phuc (2):
ASoC: samsung: i2s: Avoid mixing goto with guard()
ASoC: ti: j721e-evm: Avoid mixing goto with guard()

 sound/soc/samsung/i2s.c  | 25 +++++++++----------------
 sound/soc/ti/j721e-evm.c |  4 +++-
 2 files changed, 12 insertions(+), 17 deletions(-)
Signature · 1 line
2.43.0
#1 lore raw

PATCH 1/2 ASoC: samsung: i2s: Avoid mixing goto with guard()

From: bui duc phuc <[email protected]>

cleanup.h recommends not mixing goto-based error handling with cleanup helpers in the same function.
Remove the goto path and rely on guard(pm_runtime) for automatic cleanup instead.

Fixes 3d08517b5c67 ("ASoC: samsung: i2s: Use guard() for spin locks")
---
 sound/soc/samsung/i2s.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)
sound/soc/samsung/i2s.c +9 -16
index f80f697a5d55..f80e8d498156 100644
@@ -8,6 +8,7 @@
 #include <dt-bindings/sound/samsung-i2s.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/cleanup.h>
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/io.h>
@@ -512,7 +513,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int rfs,
 	u32 mod, mask, val = 0;
 	int ret = 0;
 
-	pm_runtime_get_sync(dai->dev);
+	guard(pm_runtime_active)(dai->dev);
 
 	scoped_guard(spinlock_irqsave, &priv->lock)
 		mod = readl(priv->addr + I2SMOD);
@@ -537,8 +538,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int rfs,
 					&& (mod & cdcon_mask))))) {
 			dev_err(&i2s->pdev->dev,
 				"%s:%d Other DAI busy\n", __func__, __LINE__);
-			ret = -EAGAIN;
-			goto err;
+			return -EAGAIN;
 		}
 
 		if (dir == SND_SOC_CLOCK_IN)
@@ -566,7 +566,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int rfs,
 				} else {
 					priv->rclk_srcrate =
 						clk_get_rate(priv->op_clk);
-					goto done;
+					return 0;
 				}
 			}
 
@@ -580,14 +580,14 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int rfs,
 			if (WARN_ON(IS_ERR(priv->op_clk))) {
 				ret = PTR_ERR(priv->op_clk);
 				priv->op_clk = NULL;
-				goto err;
+				return ret;
 			}
 
 			ret = clk_prepare_enable(priv->op_clk);
 			if (ret) {
 				clk_put(priv->op_clk);
 				priv->op_clk = NULL;
-				goto err;
+				return ret;
 			}
 			priv->rclk_srcrate = clk_get_rate(priv->op_clk);
 
@@ -595,11 +595,10 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int rfs,
 				|| (clk_id && !(mod & rsrc_mask))) {
 			dev_err(&i2s->pdev->dev,
 				"%s:%d Other DAI busy\n", __func__, __LINE__);
-			ret = -EAGAIN;
-			goto err;
+			return -EAGAIN;
 		} else {
 			/* Call can't be on the active DAI */
-			goto done;
+			return 0;
 		}
 
 		if (clk_id == 1)
@@ -607,8 +606,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int rfs,
 		break;
 	default:
 		dev_err(&i2s->pdev->dev, "We don't serve that!\n");
-		ret = -EINVAL;
-		goto err;
+		return -EINVAL;
 	}
 
 	scoped_guard(spinlock_irqsave, &priv->lock) {
@@ -616,13 +614,8 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int rfs,
 		mod = (mod & ~mask) | val;
 		writel(mod, priv->addr + I2SMOD);
 	}
-done:
-	pm_runtime_put(dai->dev);
 
 	return 0;
-err:
-	pm_runtime_put(dai->dev);
-	return ret;
 }
 
 static int i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
Signature · 1 line
2.43.0
#2 lore raw

PATCH 2/2 ASoC: ti: j721e-evm: Avoid mixing goto with guard()

In reply to [email protected]

From: bui duc phuc <[email protected]>

The previous guard(mutex) conversion mixed cleanup helpers with goto-based error handling, which is discouraged by the cleanup.h guidelines.
Restore mutex_lock()/mutex_unlock() instead.

Fixes 6f4cf77320ae ("ASoC: ti: j721e-evm: Use guard() for mutex locks")
---
 sound/soc/ti/j721e-evm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/ti/j721e-evm.c +3 -1
index c214ae0d7b95..312298e0b004 100644
@@ -4,6 +4,7 @@
  *  Author: Peter Ujfalusi <[email protected]>
  */
 
+#include <linux/cleanup.h>
 #include <linux/clk.h>
 #include <linux/module.h>
 #include <linux/of.h>
@@ -263,7 +264,7 @@ static int j721e_audio_startup(struct snd_pcm_substream *substream)
 	int ret = 0;
 	int i;
 
-	guard(mutex)(&priv->mutex);
+	mutex_lock(&priv->mutex);
 
 	domain->active++;
 
@@ -303,6 +304,7 @@ static int j721e_audio_startup(struct snd_pcm_substream *substream)
 out:
 	if (ret)
 		domain->active--;
+	mutex_unlock(&priv->mutex);
 
 	return ret;
 }
Signature · 1 line
2.43.0
maintainer
#3 lore raw
In reply to [email protected]
Quoted 11 lines · On Wed, 01 Jul 2026 11:13:08 +0700, [email protected] wrote:

ASoC: Fix mixed goto and guard() usage

From: bui duc phuc <[email protected]>

Hi all,

These two patches fix the remaining cases of mixed goto-based error handling and cleanup helpers introduced by the recent guard() conversion patches that have already been merged for the 7.2 development cycle.

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.3

Thanks!

[1/2] ASoC: samsung: i2s: Avoid mixing goto with guard()

      https://git.kernel.org/broonie/sound/c/02fd694e60a7
[2/2] ASoC: ti: j721e-evm: Avoid mixing goto with guard()
      https://git.kernel.org/broonie/sound/c/47a0dde9a3bd

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark