aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/s3c24xx/s3c2443-ac97.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-06-11 08:47:10 -0400
committerJaroslav Kysela <perex@perex.cz>2008-06-13 10:48:01 -0400
commitbdb92876f0a9d2b431199e385732ede89ff0b97d (patch)
tree5a88d9e7f370facce9e44e60c59ec5636b316b6d /sound/soc/s3c24xx/s3c2443-ac97.c
parentdbac7cb8a7fcae34ffda04e4bc30673c2ea841ae (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/s3c24xx/s3c2443-ac97.c')
-rw-r--r--sound/soc/s3c24xx/s3c2443-ac97.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c
index 0eed140dcd9b..533565b61b2f 100644
--- a/sound/soc/s3c24xx/s3c2443-ac97.c
+++ b/sound/soc/s3c24xx/s3c2443-ac97.c
@@ -209,7 +209,8 @@ static struct s3c24xx_pcm_dma_params s3c2443_ac97_mic_mono_in = {
209 .dma_size = 4, 209 .dma_size = 4,
210}; 210};
211 211
212static int s3c2443_ac97_probe(struct platform_device *pdev) 212static int s3c2443_ac97_probe(struct platform_device *pdev,
213 struct snd_soc_cpu_dai *dai)
213{ 214{
214 int ret; 215 int ret;
215 u32 ac_glbctrl; 216 u32 ac_glbctrl;
@@ -260,7 +261,8 @@ static int s3c2443_ac97_probe(struct platform_device *pdev)
260 return ret; 261 return ret;
261} 262}
262 263
263static void s3c2443_ac97_remove(struct platform_device *pdev) 264static void s3c2443_ac97_remove(struct platform_device *pdev,
265 struct snd_soc_cpu_dai *dai)
264{ 266{
265 free_irq(IRQ_S3C244x_AC97, NULL); 267 free_irq(IRQ_S3C244x_AC97, NULL);
266 clk_disable(s3c24xx_ac97.ac97_clk); 268 clk_disable(s3c24xx_ac97.ac97_clk);