aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/s3c24xx/s3c2443-ac97.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/s3c24xx/s3c2443-ac97.c')
-rw-r--r--sound/soc/s3c24xx/s3c2443-ac97.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c
index 533565b61b2f..783349b7fede 100644
--- a/sound/soc/s3c24xx/s3c2443-ac97.c
+++ b/sound/soc/s3c24xx/s3c2443-ac97.c
@@ -210,7 +210,7 @@ static struct s3c24xx_pcm_dma_params s3c2443_ac97_mic_mono_in = {
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 struct snd_soc_dai *dai)
214{ 214{
215 int ret; 215 int ret;
216 u32 ac_glbctrl; 216 u32 ac_glbctrl;
@@ -262,7 +262,7 @@ static int s3c2443_ac97_probe(struct platform_device *pdev,
262} 262}
263 263
264static void s3c2443_ac97_remove(struct platform_device *pdev, 264static void s3c2443_ac97_remove(struct platform_device *pdev,
265 struct snd_soc_cpu_dai *dai) 265 struct snd_soc_dai *dai)
266{ 266{
267 free_irq(IRQ_S3C244x_AC97, NULL); 267 free_irq(IRQ_S3C244x_AC97, NULL);
268 clk_disable(s3c24xx_ac97.ac97_clk); 268 clk_disable(s3c24xx_ac97.ac97_clk);
@@ -274,7 +274,7 @@ static int s3c2443_ac97_hw_params(struct snd_pcm_substream *substream,
274 struct snd_pcm_hw_params *params) 274 struct snd_pcm_hw_params *params)
275{ 275{
276 struct snd_soc_pcm_runtime *rtd = substream->private_data; 276 struct snd_soc_pcm_runtime *rtd = substream->private_data;
277 struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; 277 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
278 278
279 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) 279 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
280 cpu_dai->dma_data = &s3c2443_ac97_pcm_stereo_out; 280 cpu_dai->dma_data = &s3c2443_ac97_pcm_stereo_out;
@@ -316,7 +316,7 @@ static int s3c2443_ac97_hw_mic_params(struct snd_pcm_substream *substream,
316 struct snd_pcm_hw_params *params) 316 struct snd_pcm_hw_params *params)
317{ 317{
318 struct snd_soc_pcm_runtime *rtd = substream->private_data; 318 struct snd_soc_pcm_runtime *rtd = substream->private_data;
319 struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; 319 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
320 320
321 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) 321 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
322 return -ENODEV; 322 return -ENODEV;
@@ -352,7 +352,7 @@ static int s3c2443_ac97_mic_trigger(struct snd_pcm_substream *substream,
352 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | \ 352 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | \
353 SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) 353 SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
354 354
355struct snd_soc_cpu_dai s3c2443_ac97_dai[] = { 355struct snd_soc_dai s3c2443_ac97_dai[] = {
356{ 356{
357 .name = "s3c2443-ac97", 357 .name = "s3c2443-ac97",
358 .id = 0, 358 .id = 0,