lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: Replace pdev with card in machine driver probe and remove

Browse Source 
In order to support cards instantiated without using soc-audio remove
the use of the platform device in the card probe() and remove() ops.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
This commit is contained in:
Mark Brown
2011-01-26 14:17:20 +00:00
parent 70b2ac126a
commit e7361ec499
6 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1717,7 +1717,6 @@ static int snd_soc_init_codec_cache(struct snd_soc_codec *codec,
static void snd_soc_instantiate_card(struct snd_soc_card *card)
{
struct platform_device *pdev = to_platform_device(card->dev);
struct snd_soc_codec *codec;
struct snd_soc_codec_conf *codec_conf;
enum snd_soc_compress_type compress_type;
@ -1781,7 +1780,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
/* initialise the sound card only once */
if (card->probe) {
ret = card->probe(pdev);
ret = card->probe(card);
if (ret < 0)
goto card_probe_error;
}
@ -1842,7 +1841,7 @@ probe_dai_err:
card_probe_error:
if (card->remove)
card->remove(pdev);
card->remove(card);
snd_card_free(card->snd_card);
@ -1888,7 +1887,6 @@ static int soc_probe(struct platform_device *pdev)
static int soc_cleanup_card_resources(struct snd_soc_card *card)
{
struct platform_device *pdev = to_platform_device(card->dev);
int i;
/* make sure any delayed work runs */
@ -1909,7 +1907,7 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card)
/* remove the card */
if (card->remove)
card->remove(pdev);
card->remove(card);
kfree(card->rtd);
snd_card_free(card->snd_card);