Skip to content

ALSA: hda: Use scoped_guard() for remaining manual mutex handling

[email protected] linux-sound lkml 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 2 repliesIn review
  2. v13 patches 2 repliesSuperseded

Changes in v2 from the cover letter

- Patch 2: replaced 'goto err' (jumped out of scoped_guard to mutex_unlock) with 'goto err_powered_up' (stays within block), removed the 'err' label.
- Patch 3: replaced 'goto unlock' (jumped out of scoped_guard) with 'break' (exits the scoped_guard for-loop naturally), and removed the now-unused 'unlock' label.

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3ALSA: hda/cs35l41: Use scoped_guard() for fw_mutex in cs35l41_hda_bind()sound/hda/codecs/side-codecs/cs35l41_hda.c+28 -290 replies
2/3ALSA: hda/cs35l56: Use scoped_guard() for irq_lock in cs35l56_hda_fw_load()sound/hda/codecs/side-codecs/cs35l56_hda.c+51 -531 reply
3/3ALSA: hda: Use scoped_guard() for open_mutex in azx_pcm_open()sound/hda/common/controller.c+81 -771 reply

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/3] ALSA: hda: Use scoped_guard() for remaining manual mutex handling

From: wangdicheng <[email protected]>

This is a cleanup that lets the compiler guarantee the mutex is released on all exit paths, reducing the risk of accidental lock leaks in future changes. The same pattern is already used in these files: azx_pcm_close() uses scoped_guard() for open_mutex, and the rest of cs35l41 and cs35l56 drivers already use guard()/scoped_guard() for their respective mutexes.

Most of the diff is indentation change from wrapping the code inside scoped_guard() {}; the logical changes are minimal and can be reviewed with git diff/show -w.

Verified with clang-17 W=1 build, no warnings.

In v1, some goto statements jumped out of the
scoped_guard() block, which is problematic because scoped_guard()
is implemented as a for-loop and such gotos change the control
flow in non-obvious ways. This has caused real bugs before; see
commit a5c627d90809 ("gpio: adnp: fix flow control regression caused by scoped_guard()"). In v2, all goto targets are within the scoped_guard() block,
or replaced with break where the original label only served
to reach mutex_unlock.

No functional changes in any patch.

Changes in v2:
- Patch 2: replaced 'goto err' (jumped out of scoped_guard to mutex_unlock) with 'goto err_powered_up' (stays within block), removed the 'err' label.
- Patch 3: replaced 'goto unlock' (jumped out of scoped_guard) with 'break' (exits the scoped_guard for-loop naturally), and removed the now-unused 'unlock' label.

wangdicheng (3):
ALSA: hda/cs35l41: Use scoped_guard() for fw_mutex in

    cs35l41_hda_bind()
  ALSA: hda/cs35l56: Use scoped_guard() for irq_lock in
    cs35l56_hda_fw_load()

ALSA: hda: Use scoped_guard() for open_mutex in azx_pcm_open()

 sound/hda/codecs/side-codecs/cs35l41_hda.c |  57 ++++----
 sound/hda/codecs/side-codecs/cs35l56_hda.c | 104 +++++++-------
 sound/hda/common/controller.c              | 158 +++++++++++----------
 3 files changed, 160 insertions(+), 159 deletions(-)
Signature · 1 line
2.25.1