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

ASoC: soc-card: add snd_soc_card_probe() 



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

One note here is that card has "card->probe" and "card->late_probe"
callbacks.
Because it needs to care "late_probe", "card->probed" flag is set
under if (card->probe) at snd_soc_card_probe().

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


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

include/sound/soc-card.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ int snd_soc_card_suspend_post(struct snd_soc_card *card); 
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);



/* device driver data */

static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,

					    void *data)

sound/soc/soc-card.c

+23 −0
Original line number Diff line number Diff line
@@ -119,3 +119,26 @@ int snd_soc_card_resume_post(struct snd_soc_card *card) 


	return soc_card_ret(card, ret);

}



int snd_soc_card_probe(struct snd_soc_card *card)

{

	if (card->probe) {

		int ret = card->probe(card);



		if (ret < 0)

			return soc_card_ret(card, ret);



		/*

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

		 * So, set "probed" flag here, because it needs to care

		 * about "late_probe".

		 *

		 * see

		 *	snd_soc_bind_card()

		 *	snd_soc_card_late_probe()

		 */

		card->probed = 1;

	}



	return 0;

}

sound/soc/soc-core.c

+3 −6
Original line number Diff line number Diff line
@@ -1825,12 +1825,9 @@ static int snd_soc_bind_card(struct snd_soc_card *card) 
		goto probe_end;



	/* initialise the sound card only once */

	if (card->probe) {

		ret = card->probe(card);

	ret = snd_soc_card_probe(card);

	if (ret < 0)

		goto probe_end;

		card->probed = 1;

	}



	/* probe all components used by DAI links on this card */

	ret = soc_probe_link_components(card);

CRA Git | Maintained and supported by SUSTech CRA and CCSE