diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-06-11 13:47:10 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-06-13 16:48:01 +0200 |
| commit | bdb92876f0a9d2b431199e385732ede89ff0b97d (patch) | |
| tree | 5a88d9e7f370facce9e44e60c59ec5636b316b6d /sound/soc/soc-core.c | |
| parent | dbac7cb8a7fcae34ffda04e4bc30673c2ea841ae (diff) | |
| download | lwn-bdb92876f0a9d2b431199e385732ede89ff0b97d.tar.gz lwn-bdb92876f0a9d2b431199e385732ede89ff0b97d.zip | |
ALSA: ASoC: Pass the DAI being configured into CPU DAI probe and remove
This allows per-DAI initialisation to be done by the CPU DAI drivers.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f594ab888e17..c96a6184d66e 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -768,7 +768,7 @@ static int soc_probe(struct platform_device *pdev) for (i = 0; i < machine->num_links; i++) { struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai; if (cpu_dai->probe) { - ret = cpu_dai->probe(pdev); + ret = cpu_dai->probe(pdev, cpu_dai); if (ret < 0) goto cpu_dai_err; } @@ -798,7 +798,7 @@ cpu_dai_err: for (i--; i >= 0; i--) { struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai; if (cpu_dai->remove) - cpu_dai->remove(pdev); + cpu_dai->remove(pdev, cpu_dai); } if (machine->remove) @@ -827,7 +827,7 @@ static int soc_remove(struct platform_device *pdev) for (i = 0; i < machine->num_links; i++) { struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai; if (cpu_dai->remove) - cpu_dai->remove(pdev); + cpu_dai->remove(pdev, cpu_dai); } if (machine->remove) |