leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: soc-card: add snd_soc_card_remove()

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

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/87tv00zv4p.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2020-05-28 10:49:26 +09:00 committed by Mark Brown
parent 5c0eac036d
commit b0275d956f
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/soc-card.h
View File

@ -26,6 +26,7 @@ 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);
int snd_soc_card_remove(struct snd_soc_card *card);
/* device driver data */
static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,

13
sound/soc/soc-card.c
View File

@ -166,3 +166,16 @@ int snd_soc_card_late_probe(struct snd_soc_card *card)
return 0;
}
int snd_soc_card_remove(struct snd_soc_card *card)
{
int ret = 0;
if (card->probed &&
card->remove)
ret = card->remove(card);
card->probed = 0;
return soc_card_ret(card, ret);
}

4
sound/soc/soc-core.c
View File

@ -1747,9 +1747,7 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)
soc_cleanup_card_debugfs(card);
/* remove the card */
if (card->probed && card->remove)
card->remove(card);
card->probed = 0;
snd_soc_card_remove(card);
if (card->snd_card) {
snd_card_free(card->snd_card);