Maksytka/linux
1
1
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-01 15:35:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: ac97: Use guard() for spin locks

Browse Source 
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/20250829144342.4290-3-tiwai@suse.de
This commit is contained in:
Takashi Iwai
2025-08-29 16:42:37 +02:00
parent 0a36f7d69d
commit fcee249f98
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sound/pci/ac97/ac97_pcm.c
View File

@@ -570,14 +570,13 @@ int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate,
return err;
}
}
spin_lock_irq(&pcm->bus->bus_lock);
scoped_guard(spinlock_irq, &pcm->bus->bus_lock) {
for (i = 3; i < 12; i++) {
if (!(slots & (1 << i)))
continue;
ok_flag = 0;
for (cidx = 0; cidx < 4; cidx++) {
if (bus->used_slots[pcm->stream][cidx] & (1 << i)) {
spin_unlock_irq(&pcm->bus->bus_lock);
err = -EBUSY;
goto error;
}
@@ -587,7 +586,6 @@ int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate,
}
}
if (!ok_flag) {
spin_unlock_irq(&pcm->bus->bus_lock);
dev_err(bus->card->dev,
"cannot find configuration for AC97 slot %i\n",
i);
@@ -596,7 +594,7 @@ int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate,
}
}
pcm->cur_dbl = r;
spin_unlock_irq(&pcm->bus->bus_lock);
}
for (i = 3; i < 12; i++) {
if (!(slots & (1 << i)))
continue;
@@ -664,7 +662,7 @@ int snd_ac97_pcm_close(struct ac97_pcm *pcm)
#endif
bus = pcm->bus;
spin_lock_irq(&pcm->bus->bus_lock);
guard(spinlock_irq)(&pcm->bus->bus_lock);
for (i = 3; i < 12; i++) {
if (!(slots & (1 << i)))
continue;
@@ -673,7 +671,6 @@ int snd_ac97_pcm_close(struct ac97_pcm *pcm)
}
pcm->aslots = 0;
pcm->cur_dbl = 0;
spin_unlock_irq(&pcm->bus->bus_lock);
return 0;
}