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

ASoC: soc-card: add snd_soc_card_add_dai_link() 



Card related function should be implemented at soc-card now.
This patch adds it.

This patch adds missing return when error case.

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/87o8q8zv2m.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-card.h

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ int snd_soc_card_set_bias_level_post(struct snd_soc_card *card, 
				     struct snd_soc_dapm_context *dapm,

				     enum snd_soc_bias_level level);



int snd_soc_card_add_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,

					    void *data)

sound/soc/soc-card.c

+12 −0
Original line number Diff line number Diff line
@@ -203,3 +203,15 @@ int snd_soc_card_set_bias_level_post(struct snd_soc_card *card, 


	return soc_card_ret(card, ret);

}



int snd_soc_card_add_dai_link(struct snd_soc_card *card,

			      struct snd_soc_dai_link *dai_link)

{

	int ret = 0;



	if (card->add_dai_link)

		ret = card->add_dai_link(card, dai_link);



	return soc_card_ret(card, ret);

}

EXPORT_SYMBOL_GPL(snd_soc_card_add_dai_link);

sound/soc/soc-core.c

+3 −2
Original line number Diff line number Diff line
@@ -978,8 +978,9 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card, 
	/*

	 * Notify the machine driver for extra initialization

	 */

	if (card->add_dai_link)

		card->add_dai_link(card, dai_link);

	ret = snd_soc_card_add_dai_link(card, dai_link);

	if (ret < 0)

		return ret;



	if (dai_link->ignore)

		return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE