diff options
| author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2008-07-07 16:07:29 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-10 09:32:34 +0200 |
| commit | 453ba20b2800bc07a3eaf220010dc0127cc552fd (patch) | |
| tree | 37cf98140804d200a6e93285b9260d9f44ea4b87 /sound/soc/at32/at32-pcm.c | |
| parent | 3c4b266fe642bcaebe2b95edb56c3f8802924ff9 (diff) | |
ALSA: asoc: at32 - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
This patch series merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for AT32 platform.
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc/at32/at32-pcm.c')
| -rw-r--r-- | sound/soc/at32/at32-pcm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/at32/at32-pcm.c b/sound/soc/at32/at32-pcm.c index cf76e89fae6..435f1daf177 100644 --- a/sound/soc/at32/at32-pcm.c +++ b/sound/soc/at32/at32-pcm.c @@ -366,7 +366,7 @@ static struct snd_pcm_ops at32_pcm_ops = { static u64 at32_pcm_dmamask = 0xffffffff; static int at32_pcm_new(struct snd_card *card, - struct snd_soc_codec_dai *dai, + struct snd_soc_dai *dai, struct snd_pcm *pcm) { int ret = 0; @@ -422,7 +422,7 @@ static void at32_pcm_free_dma_buffers(struct snd_pcm *pcm) #ifdef CONFIG_PM static int at32_pcm_suspend(struct platform_device *pdev, - struct snd_soc_cpu_dai *dai) + struct snd_soc_dai *dai) { struct snd_pcm_runtime *runtime = dai->runtime; struct at32_runtime_data *prtd; @@ -447,7 +447,7 @@ static int at32_pcm_suspend(struct platform_device *pdev, static int at32_pcm_resume(struct platform_device *pdev, - struct snd_soc_cpu_dai *dai) + struct snd_soc_dai *dai) { struct snd_pcm_runtime *runtime = dai->runtime; struct at32_runtime_data *prtd; |