[PATCH 0/2] ASoC: Fix mixed goto and guard() usage

From: phucduc . bui

Date: Wed Jul 01 2026 - 00:13:47 EST


From: bui duc phuc <phucduc.bui@xxxxxxxxx>

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(-)

--
2.43.0