ALSA: cmi8330: Use guard() for spin locks

Clean up the code using guard() for spin locks.

Merely code refactoring, and no behavior change.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250829145300.5460-3-tiwai@suse.de

diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index e681c2c8247446187423eb25d3fb4455bb78f2b0..3d1f19321b9e97011e532a6e6167813212157a6b 100644 (file)
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -269,18 +269,17 @@ static const unsigned char cmi8330_sb_init_values[][2] = {
 static int cmi8330_add_sb_mixers(struct snd_sb *chip)
 {
        int idx, err;
-       unsigned long flags;
 
-       spin_lock_irqsave(&chip->mixer_lock, flags);
-       snd_sbmixer_write(chip, 0x00, 0x00);            /* mixer reset */
-       spin_unlock_irqrestore(&chip->mixer_lock, flags);
+       scoped_guard(spinlock_irqsave, &chip->mixer_lock) {
+               snd_sbmixer_write(chip, 0x00, 0x00);    /* mixer reset */
+       }
 
        /* mute and zero volume channels */
        for (idx = 0; idx < ARRAY_SIZE(cmi8330_sb_init_values); idx++) {
-               spin_lock_irqsave(&chip->mixer_lock, flags);
-               snd_sbmixer_write(chip, cmi8330_sb_init_values[idx][0],
-                                 cmi8330_sb_init_values[idx][1]);
-               spin_unlock_irqrestore(&chip->mixer_lock, flags);
+               scoped_guard(spinlock_irqsave, &chip->mixer_lock) {
+                       snd_sbmixer_write(chip, cmi8330_sb_init_values[idx][0],
+                                         cmi8330_sb_init_values[idx][1]);
+               }
        }
 
        for (idx = 0; idx < ARRAY_SIZE(cmi8330_sb_mixers); idx++) {