Unverified Commit 7eaa313b authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-dai: add snd_soc_pcm_dai_remove() 



We have 2 type of component functions
snd_soc_dai_xxx()     is focusing to dai itself,
snd_soc_pcm_dai_xxx() is focusing to rtd related dai.

Now we can update snd_soc_dai_remove() to
snd_soc_pcm_dai_remove(). This patch do it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-By: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87r1wdssjc.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-dai.h

+1 −1
Original line number Diff line number Diff line
@@ -158,12 +158,12 @@ snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai, 
				    struct snd_pcm_substream *substream);

void snd_soc_dai_suspend(struct snd_soc_dai *dai);

void snd_soc_dai_resume(struct snd_soc_dai *dai);

int snd_soc_dai_remove(struct snd_soc_dai *dai);

int snd_soc_dai_compress_new(struct snd_soc_dai *dai,

			     struct snd_soc_pcm_runtime *rtd, int num);

bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream);



int snd_soc_pcm_dai_probe(struct snd_soc_pcm_runtime *rtd, int order);

int snd_soc_pcm_dai_remove(struct snd_soc_pcm_runtime *rtd, int order);

int snd_soc_pcm_dai_new(struct snd_soc_pcm_runtime *rtd);

int snd_soc_pcm_dai_prepare(struct snd_pcm_substream *substream);

int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream, int cmd);

sound/soc/soc-core.c

+2 −22
Original line number Diff line number Diff line
@@ -1256,35 +1256,15 @@ err_probe: 
	return ret;

}



static void soc_remove_dai(struct snd_soc_dai *dai, int order)

{

	int err;



	if (!dai || !dai->probed || !dai->driver ||

	    dai->driver->remove_order != order)

		return;



	err = snd_soc_dai_remove(dai);

	if (err < 0)

		dev_err(dai->dev,

			"ASoC: failed to remove %s: %d\n",

			dai->name, err);



	dai->probed = 0;

}



static void soc_remove_link_dais(struct snd_soc_card *card)

{

	int i;

	struct snd_soc_dai *dai;

	struct snd_soc_pcm_runtime *rtd;

	int order;



	for_each_comp_order(order) {

		for_each_card_rtds(card, rtd) {

			/* remove DAIs */

			for_each_rtd_dais(rtd, i, dai)

				soc_remove_dai(dai, order);

			/* remove all rtd connected DAIs in good order */

			snd_soc_pcm_dai_remove(rtd, order);

		}

	}

}

sound/soc/soc-dai.c

+22 −10
Original line number Diff line number Diff line
@@ -366,16 +366,6 @@ snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai, 
	return delay;

}



int snd_soc_dai_remove(struct snd_soc_dai *dai)

{

	int ret = 0;



	if (dai->driver->remove)

		ret = dai->driver->remove(dai);



	return soc_dai_ret(dai, ret);

}



int snd_soc_dai_compress_new(struct snd_soc_dai *dai,

			     struct snd_soc_pcm_runtime *rtd, int num)

{
@@ -420,6 +410,28 @@ int snd_soc_pcm_dai_probe(struct snd_soc_pcm_runtime *rtd, int order) 
	return 0;

}



int snd_soc_pcm_dai_remove(struct snd_soc_pcm_runtime *rtd, int order)

{

	struct snd_soc_dai *dai;

	int i, r, ret = 0;



	for_each_rtd_dais(rtd, i, dai) {

		if (dai->driver->remove_order != order)

			continue;



		if (dai->probed &&

		    dai->driver->remove) {

			r = dai->driver->remove(dai);

			if (r < 0)

				ret = r; /* use last error */

		}



		dai->probed = 0;

	}



	return ret;

}



int snd_soc_pcm_dai_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_dai *dai;

CRA Git | Maintained and supported by SUSTech CRA and CCSE