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

ASoC: soc-card: add snd_soc_card_remove_dai_link() 



Card related function should be implemented at soc-card now.
This patch adds 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/87mu5szv2h.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-card.h

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ int snd_soc_card_set_bias_level_post(struct snd_soc_card *card, 


int snd_soc_card_add_dai_link(struct snd_soc_card *card,

			      struct snd_soc_dai_link *dai_link);

void snd_soc_card_remove_dai_link(struct snd_soc_card *card,

				  struct snd_soc_dai_link *dai_link);



/* device driver data */

static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,

sound/soc/soc-card.c

+8 −0
Original line number Diff line number Diff line
@@ -215,3 +215,11 @@ int snd_soc_card_add_dai_link(struct snd_soc_card *card, 
	return soc_card_ret(card, ret);

}

EXPORT_SYMBOL_GPL(snd_soc_card_add_dai_link);



void snd_soc_card_remove_dai_link(struct snd_soc_card *card,

				  struct snd_soc_dai_link *dai_link)

{

	if (card->remove_dai_link)

		card->remove_dai_link(card, dai_link);

}

EXPORT_SYMBOL_GPL(snd_soc_card_remove_dai_link);

sound/soc/soc-core.c

+1 −2
Original line number Diff line number Diff line
@@ -947,8 +947,7 @@ void snd_soc_remove_pcm_runtime(struct snd_soc_card *card, 
	/*

	 * Notify the machine driver for extra destruction

	 */

	if (card->remove_dai_link)

		card->remove_dai_link(card, rtd->dai_link);

	snd_soc_card_remove_dai_link(card, rtd->dai_link);



	soc_free_pcm_runtime(rtd);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE