Skip to content

Commit

Permalink
ALSA: sb: Drop NULL check for snd_ctl_remove()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai committed Jun 18, 2024
1 parent e946455 commit 4d4500b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
6 changes: 2 additions & 4 deletions sound/isa/sb/emu8000.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
12 changes: 4 additions & 8 deletions sound/isa/sb/sb16_csp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 4d4500b

Please sign in to comment.