Unverified Commit 7459f8b7 authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: topology: remove useless code 



The patch "ASoC: SOF: Intel: hda: assign link DMA channel at run-time"
fixed the sof_link_hda_unload() to remove the call to the BE
hw_free op but left the rest of code that become redundant.

So, remove sof_link_hda_unload() along with the link_unload() op
entirely as it is not longer needed.

Reported-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20210409220522.1542865-1-ranjani.sridharan@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b2fe8579

sound/soc/sof/topology.c

+0 −64
Original line number Diff line number Diff line
@@ -3371,69 +3371,6 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, 
	return ret;

}



static int sof_link_hda_unload(struct snd_sof_dev *sdev,

			       struct snd_soc_dai_link *link)

{

	struct snd_soc_dai *dai;



	dai = snd_soc_find_dai(link->cpus);

	if (!dai) {

		dev_err(sdev->dev, "error: failed to find dai %s in %s",

			link->cpus->dai_name, __func__);

		return -EINVAL;

	}



	return 0;

}



static int sof_link_unload(struct snd_soc_component *scomp,

			   struct snd_soc_dobj *dobj)

{

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);

	struct snd_soc_dai_link *link =

		container_of(dobj, struct snd_soc_dai_link, dobj);



	struct snd_sof_dai *sof_dai;

	int ret = 0;



	/* only BE link is loaded by sof */

	if (!link->no_pcm)

		return 0;



	list_for_each_entry(sof_dai, &sdev->dai_list, list) {

		if (!sof_dai->name)

			continue;



		if (strcmp(link->name, sof_dai->name) == 0)

			goto found;

	}



	dev_err(scomp->dev, "error: failed to find dai %s in %s",

		link->name, __func__);

	return -EINVAL;

found:



	switch (sof_dai->dai_config->type) {

	case SOF_DAI_INTEL_SSP:

	case SOF_DAI_INTEL_DMIC:

	case SOF_DAI_INTEL_ALH:

	case SOF_DAI_IMX_SAI:

	case SOF_DAI_IMX_ESAI:

		/* no resource needs to be released for all cases above */

		break;

	case SOF_DAI_INTEL_HDA:

		ret = sof_link_hda_unload(sdev, link);

		break;

	default:

		dev_err(scomp->dev, "error: invalid DAI type %d\n",

			sof_dai->dai_config->type);

		ret = -EINVAL;

		break;

	}



	return ret;

}



/* DAI link - used for any driver specific init */

static int sof_route_load(struct snd_soc_component *scomp, int index,

			  struct snd_soc_dapm_route *route)
@@ -3734,7 +3671,6 @@ static struct snd_soc_tplg_ops sof_tplg_ops = { 


	/* DAI link - used for any driver specific init */

	.link_load	= sof_link_load,

	.link_unload	= sof_link_unload,



	/* completion - called at completion of firmware loading */

	.complete	= sof_complete,