diff options
Diffstat (limited to 'sound/soc/sh')
-rw-r--r-- | sound/soc/sh/dma-sh7760.c | 6 | ||||
-rw-r--r-- | sound/soc/sh/fsi.c | 6 | ||||
-rw-r--r-- | sound/soc/sh/siu_pcm.c | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c index c326d29992fe..db74005f37ce 100644 --- a/sound/soc/sh/dma-sh7760.c +++ b/sound/soc/sh/dma-sh7760.c | |||
@@ -327,10 +327,10 @@ static void camelot_pcm_free(struct snd_pcm *pcm) | |||
327 | snd_pcm_lib_preallocate_free_for_all(pcm); | 327 | snd_pcm_lib_preallocate_free_for_all(pcm); |
328 | } | 328 | } |
329 | 329 | ||
330 | static int camelot_pcm_new(struct snd_card *card, | 330 | static int camelot_pcm_new(struct snd_soc_pcm_runtime *rtd) |
331 | struct snd_soc_dai *dai, | ||
332 | struct snd_pcm *pcm) | ||
333 | { | 331 | { |
332 | struct snd_pcm *pcm = rtd->pcm; | ||
333 | |||
334 | /* dont use SNDRV_DMA_TYPE_DEV, since it will oops the SH kernel | 334 | /* dont use SNDRV_DMA_TYPE_DEV, since it will oops the SH kernel |
335 | * in MMAP mode (i.e. aplay -M) | 335 | * in MMAP mode (i.e. aplay -M) |
336 | */ | 336 | */ |
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index d2f17cefa92f..8e112ccffb13 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c | |||
@@ -1168,10 +1168,10 @@ static void fsi_pcm_free(struct snd_pcm *pcm) | |||
1168 | snd_pcm_lib_preallocate_free_for_all(pcm); | 1168 | snd_pcm_lib_preallocate_free_for_all(pcm); |
1169 | } | 1169 | } |
1170 | 1170 | ||
1171 | static int fsi_pcm_new(struct snd_card *card, | 1171 | static int fsi_pcm_new(struct snd_soc_pcm_runtime *rtd) |
1172 | struct snd_soc_dai *dai, | ||
1173 | struct snd_pcm *pcm) | ||
1174 | { | 1172 | { |
1173 | struct snd_pcm *pcm = rtd->pcm; | ||
1174 | |||
1175 | /* | 1175 | /* |
1176 | * dont use SNDRV_DMA_TYPE_DEV, since it will oops the SH kernel | 1176 | * dont use SNDRV_DMA_TYPE_DEV, since it will oops the SH kernel |
1177 | * in MMAP mode (i.e. aplay -M) | 1177 | * in MMAP mode (i.e. aplay -M) |
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c index a423babcf145..f8f681690a71 100644 --- a/sound/soc/sh/siu_pcm.c +++ b/sound/soc/sh/siu_pcm.c | |||
@@ -527,10 +527,11 @@ static snd_pcm_uframes_t siu_pcm_pointer_dma(struct snd_pcm_substream *ss) | |||
527 | return bytes_to_frames(ss->runtime, ptr); | 527 | return bytes_to_frames(ss->runtime, ptr); |
528 | } | 528 | } |
529 | 529 | ||
530 | static int siu_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, | 530 | static int siu_pcm_new(struct snd_soc_pcm_runtime *rtd) |
531 | struct snd_pcm *pcm) | ||
532 | { | 531 | { |
533 | /* card->dev == socdev->dev, see snd_soc_new_pcms() */ | 532 | /* card->dev == socdev->dev, see snd_soc_new_pcms() */ |
533 | struct snd_card *card = rtd->card->snd_card; | ||
534 | struct snd_pcm *pcm = rtd->pcm; | ||
534 | struct siu_info *info = siu_i2s_data; | 535 | struct siu_info *info = siu_i2s_data; |
535 | struct platform_device *pdev = to_platform_device(card->dev); | 536 | struct platform_device *pdev = to_platform_device(card->dev); |
536 | int ret; | 537 | int ret; |