Skip to content

Commit cbc7a6b

Browse files
morimotobroonie
authored andcommitted
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 <[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 d41278e commit cbc7a6b

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

include/sound/soc-card.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ int snd_soc_card_set_bias_level_post(struct snd_soc_card *card,
3535
struct snd_soc_dapm_context *dapm,
3636
enum snd_soc_bias_level level);
3737

38+
int snd_soc_card_add_dai_link(struct snd_soc_card *card,
39+
struct snd_soc_dai_link *dai_link);
40+
3841
/* device driver data */
3942
static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,
4043
void *data)

sound/soc/soc-card.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,3 +203,15 @@ int snd_soc_card_set_bias_level_post(struct snd_soc_card *card,
203203

204204
return soc_card_ret(card, ret);
205205
}
206+
207+
int snd_soc_card_add_dai_link(struct snd_soc_card *card,
208+
struct snd_soc_dai_link *dai_link)
209+
{
210+
int ret = 0;
211+
212+
if (card->add_dai_link)
213+
ret = card->add_dai_link(card, dai_link);
214+
215+
return soc_card_ret(card, ret);
216+
}
217+
EXPORT_SYMBOL_GPL(snd_soc_card_add_dai_link);

sound/soc/soc-core.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -978,8 +978,9 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card,
978978
/*
979979
* Notify the machine driver for extra initialization
980980
*/
981-
if (card->add_dai_link)
982-
card->add_dai_link(card, dai_link);
981+
ret = snd_soc_card_add_dai_link(card, dai_link);
982+
if (ret < 0)
983+
return ret;
983984

984985
if (dai_link->ignore)
985986
return 0;

0 commit comments

Comments
 (0)