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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Link: https://lore.kernel.org/r/87o8q8zv2m.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
d41278ea05
Коммит
cbc7a6b5a8
|
@ -35,6 +35,9 @@ int snd_soc_card_set_bias_level_post(struct snd_soc_card *card,
|
||||||
struct snd_soc_dapm_context *dapm,
|
struct snd_soc_dapm_context *dapm,
|
||||||
enum snd_soc_bias_level level);
|
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 */
|
/* device driver data */
|
||||||
static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,
|
static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,
|
||||||
void *data)
|
void *data)
|
||||||
|
|
|
@ -203,3 +203,15 @@ int snd_soc_card_set_bias_level_post(struct snd_soc_card *card,
|
||||||
|
|
||||||
return soc_card_ret(card, ret);
|
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);
|
||||||
|
|
|
@ -978,8 +978,9 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card,
|
||||||
/*
|
/*
|
||||||
* Notify the machine driver for extra initialization
|
* Notify the machine driver for extra initialization
|
||||||
*/
|
*/
|
||||||
if (card->add_dai_link)
|
ret = snd_soc_card_add_dai_link(card, dai_link);
|
||||||
card->add_dai_link(card, dai_link);
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
if (dai_link->ignore)
|
if (dai_link->ignore)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче