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/davinci | |
| parent | ALSA: ASoC: Add missing includes (diff) | |
| download | linux-dev-bdb92876f0a9d2b431199e385732ede89ff0b97d.tar.xz linux-dev-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/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) return ret; } -static int davinci_i2s_probe(struct platform_device *pdev) +static int davinci_i2s_probe(struct platform_device *pdev, + struct snd_soc_cpu_dai *dai) { struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_machine *machine = socdev->machine; @@ -356,7 +357,8 @@ err_release_region: return ret; } -static void davinci_i2s_remove(struct platform_device *pdev) +static void davinci_i2s_remove(struct platform_device *pdev, + struct snd_soc_cpu_dai *dai) { struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_machine *machine = socdev->machine; |