Commit 4d4500b4 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: sb: Drop NULL check for snd_ctl_remove() 

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: default avatarTakashi Iwai <tiwai@suse.de>
parent e946455c

sound/isa/sb/emu8000.c

+2 −4
Original line number Diff line number Diff line
@@ -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])

	for (i = 0; i < EMU8000_NUM_CONTROLS; i++)

		snd_ctl_remove(card, emu->controls[i]);

	}

	return err;

}

sound/isa/sb/sb16_csp.c

+4 −8
Original line number Diff line number Diff line
@@ -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;

	}



	/* cancel pending transfer of QSound parameters */

	spin_lock_irqsave (&p->q_lock, flags);