diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-06-11 08:47:10 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-06-13 10:48:01 -0400 |
commit | bdb92876f0a9d2b431199e385732ede89ff0b97d (patch) | |
tree | 5a88d9e7f370facce9e44e60c59ec5636b316b6d /sound/soc/davinci | |
parent | dbac7cb8a7fcae34ffda04e4bc30673c2ea841ae (diff) |
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/davinci')
-rw-r--r-- | sound/soc/davinci/davinci-i2s.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index c421774b33ee..c3b545ccff72 100644 --- a/sound/soc/davinci/davinci-i2s.c +++ b/sound/soc/davinci/davinci-i2s.c | |||
@@ -295,7 +295,8 @@ static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd) | |||
295 | return ret; | 295 | return ret; |
296 | } | 296 | } |
297 | 297 | ||
298 | static int davinci_i2s_probe(struct platform_device *pdev) | 298 | static int davinci_i2s_probe(struct platform_device *pdev, |
299 | struct snd_soc_cpu_dai *dai) | ||
299 | { | 300 | { |
300 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | 301 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); |
301 | struct snd_soc_machine *machine = socdev->machine; | 302 | struct snd_soc_machine *machine = socdev->machine; |
@@ -356,7 +357,8 @@ err_release_region: | |||
356 | return ret; | 357 | return ret; |
357 | } | 358 | } |
358 | 359 | ||
359 | static void davinci_i2s_remove(struct platform_device *pdev) | 360 | static void davinci_i2s_remove(struct platform_device *pdev, |
361 | struct snd_soc_cpu_dai *dai) | ||
360 | { | 362 | { |
361 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | 363 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); |
362 | struct snd_soc_machine *machine = socdev->machine; | 364 | struct snd_soc_machine *machine = socdev->machine; |