ALSA: hda: 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-5-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/hda_cs_dsp_ctl.c b/sound/pci/hda/hda_cs_dsp_ctl.c
index e6e876998e7131962b30110fd5b1205fb80e5c67..deb74c2470829ff6014fcef26be56e8b292bd620 100644 (file)
--- a/sound/pci/hda/hda_cs_dsp_ctl.c
+++ b/sound/pci/hda/hda_cs_dsp_ctl.c
@@ -207,7 +207,7 @@ void hda_cs_dsp_control_remove(struct cs_dsp_coeff_ctl *cs_ctl)
        struct hda_cs_dsp_coeff_ctl *ctl = cs_ctl->priv;
 
        /* ctl and kctl may already have been removed by ALSA private_free */
-       if (ctl && ctl->kctl)
+       if (ctl)
                snd_ctl_remove(ctl->card, ctl->kctl);
 }
 EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_control_remove, SND_HDA_CS_DSP_CONTROLS);

diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c
index d7af4fd107145e0605675d175529fb9bbc25062b..879d4b48e6c744ea87c5b54bd6065179388859cd 100644 (file)
--- a/sound/pci/hda/tas2781_hda_i2c.c
+++ b/sound/pci/hda/tas2781_hda_i2c.c
@@ -597,18 +597,13 @@ static void tas2781_hda_remove_controls(struct tas2781_hda *tas_hda)
 {
        struct hda_codec *codec = tas_hda->priv->codec;
 
-       if (tas_hda->dsp_prog_ctl)
-               snd_ctl_remove(codec->card, tas_hda->dsp_prog_ctl);
-
-       if (tas_hda->dsp_conf_ctl)
-               snd_ctl_remove(codec->card, tas_hda->dsp_conf_ctl);
+       snd_ctl_remove(codec->card, tas_hda->dsp_prog_ctl);
+       snd_ctl_remove(codec->card, tas_hda->dsp_conf_ctl);
 
        for (int i = ARRAY_SIZE(tas_hda->snd_ctls) - 1; i >= 0; i--)
-               if (tas_hda->snd_ctls[i])
-                       snd_ctl_remove(codec->card, tas_hda->snd_ctls[i]);
+               snd_ctl_remove(codec->card, tas_hda->snd_ctls[i]);
 
-       if (tas_hda->prof_ctl)
-               snd_ctl_remove(codec->card, tas_hda->prof_ctl);
+       snd_ctl_remove(codec->card, tas_hda->prof_ctl);
 }
 
 static void tasdev_fw_ready(const struct firmware *fmw, void *context)