]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ASoC: SOF: topology: remove redundant code
authorRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Mon, 7 Mar 2022 18:10:58 +0000 (10:10 -0800)
committerMark Brown <broonie@kernel.org>
Tue, 8 Mar 2022 12:27:43 +0000 (12:27 +0000)
With the change in the commit:
"ASoC: SOF: Intel: hda: assign link DMA channel at run-time",
there is no need to find the CPU DAI in sof_link_hda_load().

Fixes: bc6fd60a5edf ('ASoC: SOF: Intel: hda: assign link DMA channel at
run-time')

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220307181111.49392-6-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/topology.c

index add0b3009588417ad1800c860088a0afcf321de9..15ec5959630069cc218e0a25cf1d322d6993426a 100644 (file)
@@ -3140,7 +3140,6 @@ static int sof_link_hda_load(struct snd_soc_component *scomp, int index,
 {
        struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
        struct snd_soc_tplg_private *private = &cfg->priv;
-       struct snd_soc_dai *dai;
        u32 size = sizeof(*config);
        int ret;
 
@@ -3161,13 +3160,6 @@ static int sof_link_hda_load(struct snd_soc_component *scomp, int index,
        dev_dbg(scomp->dev, "HDA config rate %d channels %d\n",
                config->hda.rate, config->hda.channels);
 
-       dai = snd_soc_find_dai(link->cpus);
-       if (!dai) {
-               dev_err(scomp->dev, "error: failed to find dai %s in %s",
-                       link->cpus->dai_name, __func__);
-               return -EINVAL;
-       }
-
        config->hda.link_dma_ch = DMA_CHAN_INVALID;
 
        ret = sof_set_dai_config(sdev, size, link, config);