diff options
Diffstat (limited to 'sound/soc/s3c24xx/s3c2412-i2s.c')
-rw-r--r-- | sound/soc/s3c24xx/s3c2412-i2s.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index ded7d995a922..360cc2a49d9d 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c | |||
@@ -343,7 +343,8 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai, | |||
343 | } | 343 | } |
344 | 344 | ||
345 | static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream, | 345 | static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream, |
346 | struct snd_pcm_hw_params *params) | 346 | struct snd_pcm_hw_params *params, |
347 | struct snd_soc_dai *dai) | ||
347 | { | 348 | { |
348 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 349 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
349 | u32 iismod; | 350 | u32 iismod; |
@@ -373,7 +374,8 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream, | |||
373 | return 0; | 374 | return 0; |
374 | } | 375 | } |
375 | 376 | ||
376 | static int s3c2412_i2s_trigger(struct snd_pcm_substream *substream, int cmd) | 377 | static int s3c2412_i2s_trigger(struct snd_pcm_substream *substream, int cmd, |
378 | struct snd_soc_dai *dai) | ||
377 | { | 379 | { |
378 | int capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE); | 380 | int capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE); |
379 | unsigned long irqs; | 381 | unsigned long irqs; |
@@ -730,8 +732,6 @@ struct snd_soc_dai s3c2412_i2s_dai = { | |||
730 | .ops = { | 732 | .ops = { |
731 | .trigger = s3c2412_i2s_trigger, | 733 | .trigger = s3c2412_i2s_trigger, |
732 | .hw_params = s3c2412_i2s_hw_params, | 734 | .hw_params = s3c2412_i2s_hw_params, |
733 | }, | ||
734 | .dai_ops = { | ||
735 | .set_fmt = s3c2412_i2s_set_fmt, | 735 | .set_fmt = s3c2412_i2s_set_fmt, |
736 | .set_clkdiv = s3c2412_i2s_set_clkdiv, | 736 | .set_clkdiv = s3c2412_i2s_set_clkdiv, |
737 | .set_sysclk = s3c2412_i2s_set_sysclk, | 737 | .set_sysclk = s3c2412_i2s_set_sysclk, |