diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-06-17 12:05:24 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-06-18 12:51:50 +0200 |
| commit | 4d4500b4396a226d159b2633b091c0b65509b24a (patch) | |
| tree | bad978c3171ff97c72c271d31480c0b893a76843 /sound/isa | |
| parent | ALSA: control: Allow NULL passed to snd_ctl_remove() (diff) | |
| download | linux-4d4500b4396a226d159b2633b091c0b65509b24a.tar.xz linux-4d4500b4396a226d159b2633b091c0b65509b24a.zip | |
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: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa')
| -rw-r--r-- | sound/isa/sb/emu8000.c | 6 | ||||
| -rw-r--r-- | sound/isa/sb/sb16_csp.c | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c index a6405772d537..af478c36ce5b 100644 --- a/sound/isa/sb/emu8000.c +++ b/sound/isa/sb/emu8000.c @@ -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; } diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c index 8d8357019719..fdb992733bde 100644 --- a/sound/isa/sb/sb16_csp.c +++ b/sound/isa/sb/sb16_csp.c @@ -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); |