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

ASoC: soc-card: add snd_soc_card_late_probe() 



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

card has "card->probe" and "card->late_probe" callbacks,
and "late_probe" callback is called after "probe".
This means, we can set "card->probed" flag afer "late_probe"
for all cases.

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


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

include/sound/soc-card.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ int snd_soc_card_resume_pre(struct snd_soc_card *card); 
int snd_soc_card_resume_post(struct snd_soc_card *card);



int snd_soc_card_probe(struct snd_soc_card *card);

int snd_soc_card_late_probe(struct snd_soc_card *card);



/* device driver data */

static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,

sound/soc/soc-card.c

+24 −0
Original line number Diff line number Diff line
@@ -142,3 +142,27 @@ int snd_soc_card_probe(struct snd_soc_card *card) 


	return 0;

}



int snd_soc_card_late_probe(struct snd_soc_card *card)

{

	if (card->late_probe) {

		int ret = card->late_probe(card);



		if (ret < 0)

			return soc_card_ret(card, ret);

	}



	/*

	 * It has "card->probe" and "card->late_probe" callbacks,

	 * and "late_probe" callback is called after "probe".

	 * This means, we can set "card->probed" flag afer "late_probe"

	 * for all cases.

	 *

	 * see

	 *	snd_soc_bind_card()

	 *	snd_soc_card_probe()

	 */

	card->probed = 1;



	return 0;

}

sound/soc/soc-core.c

+3 −9
Original line number Diff line number Diff line
@@ -1910,15 +1910,9 @@ static int snd_soc_bind_card(struct snd_soc_card *card) 
		}

	}



	if (card->late_probe) {

		ret = card->late_probe(card);

		if (ret < 0) {

			dev_err(card->dev, "ASoC: %s late_probe() failed: %d\n",

				card->name, ret);

	ret = snd_soc_card_late_probe(card);

	if (ret < 0)

		goto probe_end;

		}

	}

	card->probed = 1;



	snd_soc_dapm_new_widgets(card);

CRA Git | Maintained and supported by SUSTech CRA and CCSE