Skip to content

Commit fcbbcc3

Browse files
morimotobroonie
authored andcommitted
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: Kuninori Morimoto <[email protected]> Reviewed-by: Ranjani Sridharan <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent cbc7a6b commit fcbbcc3

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

include/sound/soc-card.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ int snd_soc_card_set_bias_level_post(struct snd_soc_card *card,
3737

3838
int snd_soc_card_add_dai_link(struct snd_soc_card *card,
3939
struct snd_soc_dai_link *dai_link);
40+
void snd_soc_card_remove_dai_link(struct snd_soc_card *card,
41+
struct snd_soc_dai_link *dai_link);
4042

4143
/* device driver data */
4244
static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,

sound/soc/soc-card.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,3 +215,11 @@ int snd_soc_card_add_dai_link(struct snd_soc_card *card,
215215
return soc_card_ret(card, ret);
216216
}
217217
EXPORT_SYMBOL_GPL(snd_soc_card_add_dai_link);
218+
219+
void snd_soc_card_remove_dai_link(struct snd_soc_card *card,
220+
struct snd_soc_dai_link *dai_link)
221+
{
222+
if (card->remove_dai_link)
223+
card->remove_dai_link(card, dai_link);
224+
}
225+
EXPORT_SYMBOL_GPL(snd_soc_card_remove_dai_link);

sound/soc/soc-core.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -947,8 +947,7 @@ void snd_soc_remove_pcm_runtime(struct snd_soc_card *card,
947947
/*
948948
* Notify the machine driver for extra destruction
949949
*/
950-
if (card->remove_dai_link)
951-
card->remove_dai_link(card, rtd->dai_link);
950+
snd_soc_card_remove_dai_link(card, rtd->dai_link);
952951

953952
soc_free_pcm_runtime(rtd);
954953
}

0 commit comments

Comments
 (0)