Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+7 -8
+7 -8
sound/isa/cmi8330.c
··· 269 269 static int cmi8330_add_sb_mixers(struct snd_sb *chip) 270 270 { 271 271 int idx, err; 272 - unsigned long flags; 273 272 274 - spin_lock_irqsave(&chip->mixer_lock, flags); 275 - snd_sbmixer_write(chip, 0x00, 0x00); /* mixer reset */ 276 - spin_unlock_irqrestore(&chip->mixer_lock, flags); 273 + scoped_guard(spinlock_irqsave, &chip->mixer_lock) { 274 + snd_sbmixer_write(chip, 0x00, 0x00); /* mixer reset */ 275 + } 277 276 278 277 /* mute and zero volume channels */ 279 278 for (idx = 0; idx < ARRAY_SIZE(cmi8330_sb_init_values); idx++) { 280 - spin_lock_irqsave(&chip->mixer_lock, flags); 281 - snd_sbmixer_write(chip, cmi8330_sb_init_values[idx][0], 282 - cmi8330_sb_init_values[idx][1]); 283 - spin_unlock_irqrestore(&chip->mixer_lock, flags); 279 + scoped_guard(spinlock_irqsave, &chip->mixer_lock) { 280 + snd_sbmixer_write(chip, cmi8330_sb_init_values[idx][0], 281 + cmi8330_sb_init_values[idx][1]); 282 + } 284 283 } 285 284 286 285 for (idx = 0; idx < ARRAY_SIZE(cmi8330_sb_mixers); idx++) {