Blaster4385/linux-IllusionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALSA: sb: Drop NULL check for snd_ctl_remove()

Browse source 
Since snd_ctl_remove() accepts the NULL kcontrol argument now, we can
drop the check in the caller side.

Link: https://lore.kernel.org/20240617100529.6667-3-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2024-06-17 12:05:24 +02:00
parent e946455ce1
commit 4d4500b439
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/isa/sb/emu8000.c
View file

@ -1039,10 +1039,8 @@ snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu)
return 0;
__error:
for (i = 0; i < EMU8000_NUM_CONTROLS; i++) {
if (emu->controls[i])
snd_ctl_remove(card, emu->controls[i]);
}
for (i = 0; i < EMU8000_NUM_CONTROLS; i++)
snd_ctl_remove(card, emu->controls[i]);
return err;
}

12
sound/isa/sb/sb16_csp.c
View file

@ -1080,14 +1080,10 @@ static void snd_sb_qsound_destroy(struct snd_sb_csp * p)
card = p->chip->card;
if (p->qsound_switch) {
snd_ctl_remove(card, p->qsound_switch);
p->qsound_switch = NULL;
}
if (p->qsound_space) {
snd_ctl_remove(card, p->qsound_space);
p->qsound_space = NULL;
}
snd_ctl_remove(card, p->qsound_switch);
p->qsound_switch = NULL;
snd_ctl_remove(card, p->qsound_space);
p->qsound_space = NULL;
/* cancel pending transfer of QSound parameters */
spin_lock_irqsave (&p->q_lock, flags);