aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Girdwood <lg@opensource.wolfsonmicro.com>2008-07-07 11:07:42 -0400
committerJaroslav Kysela <perex@perex.cz>2008-07-10 03:32:37 -0400
commit9cb132d743cf39b3bbe4288e9035217e7237a0bb (patch)
tree6afa0bf419181ebf8fda2d6d26eddcbd58cabe24
parentd37ae539a1d76da8fe5a939ce8b6d818501c8716 (diff)
ALSA: asoc: davinci - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
This patch merges struct snd_soc_codec_dai and struct snd_soc_cpu_dai into struct snd_soc_dai for the DaVinci 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>
-rw-r--r--sound/soc/davinci/davinci-evm.c4
-rw-r--r--sound/soc/davinci/davinci-i2s.c14
-rw-r--r--sound/soc/davinci/davinci-i2s.h2
-rw-r--r--sound/soc/davinci/davinci-pcm.c2
4 files changed, 11 insertions, 11 deletions
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index 091eae3a9631..4249e6a85743 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -33,8 +33,8 @@ static int evm_hw_params(struct snd_pcm_substream *substream,
33 struct snd_pcm_hw_params *params) 33 struct snd_pcm_hw_params *params)
34{ 34{
35 struct snd_soc_pcm_runtime *rtd = substream->private_data; 35 struct snd_soc_pcm_runtime *rtd = substream->private_data;
36 struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; 36 struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
37 struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; 37 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
38 int ret = 0; 38 int ret = 0;
39 39
40 /* set codec DAI configuration */ 40 /* set codec DAI configuration */
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index c3b545ccff72..5ebf1ff71c4c 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -147,7 +147,7 @@ static void davinci_mcbsp_stop(struct snd_pcm_substream *substream)
147static int davinci_i2s_startup(struct snd_pcm_substream *substream) 147static int davinci_i2s_startup(struct snd_pcm_substream *substream)
148{ 148{
149 struct snd_soc_pcm_runtime *rtd = substream->private_data; 149 struct snd_soc_pcm_runtime *rtd = substream->private_data;
150 struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; 150 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
151 struct davinci_mcbsp_dev *dev = rtd->dai->cpu_dai->private_data; 151 struct davinci_mcbsp_dev *dev = rtd->dai->cpu_dai->private_data;
152 152
153 cpu_dai->dma_data = dev->dma_params[substream->stream]; 153 cpu_dai->dma_data = dev->dma_params[substream->stream];
@@ -155,7 +155,7 @@ static int davinci_i2s_startup(struct snd_pcm_substream *substream)
155 return 0; 155 return 0;
156} 156}
157 157
158static int davinci_i2s_set_dai_fmt(struct snd_soc_cpu_dai *cpu_dai, 158static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
159 unsigned int fmt) 159 unsigned int fmt)
160{ 160{
161 struct davinci_mcbsp_dev *dev = cpu_dai->private_data; 161 struct davinci_mcbsp_dev *dev = cpu_dai->private_data;
@@ -296,11 +296,11 @@ static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd)
296} 296}
297 297
298static int davinci_i2s_probe(struct platform_device *pdev, 298static int davinci_i2s_probe(struct platform_device *pdev,
299 struct snd_soc_cpu_dai *dai) 299 struct snd_soc_dai *dai)
300{ 300{
301 struct snd_soc_device *socdev = platform_get_drvdata(pdev); 301 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
302 struct snd_soc_machine *machine = socdev->machine; 302 struct snd_soc_machine *machine = socdev->machine;
303 struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai; 303 struct snd_soc_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai;
304 struct davinci_mcbsp_dev *dev; 304 struct davinci_mcbsp_dev *dev;
305 struct resource *mem, *ioarea; 305 struct resource *mem, *ioarea;
306 struct evm_snd_platform_data *pdata; 306 struct evm_snd_platform_data *pdata;
@@ -358,11 +358,11 @@ err_release_region:
358} 358}
359 359
360static void davinci_i2s_remove(struct platform_device *pdev, 360static void davinci_i2s_remove(struct platform_device *pdev,
361 struct snd_soc_cpu_dai *dai) 361 struct snd_soc_dai *dai)
362{ 362{
363 struct snd_soc_device *socdev = platform_get_drvdata(pdev); 363 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
364 struct snd_soc_machine *machine = socdev->machine; 364 struct snd_soc_machine *machine = socdev->machine;
365 struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai; 365 struct snd_soc_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai;
366 struct davinci_mcbsp_dev *dev = cpu_dai->private_data; 366 struct davinci_mcbsp_dev *dev = cpu_dai->private_data;
367 struct resource *mem; 367 struct resource *mem;
368 368
@@ -378,7 +378,7 @@ static void davinci_i2s_remove(struct platform_device *pdev,
378 378
379#define DAVINCI_I2S_RATES SNDRV_PCM_RATE_8000_96000 379#define DAVINCI_I2S_RATES SNDRV_PCM_RATE_8000_96000
380 380
381struct snd_soc_cpu_dai davinci_i2s_dai = { 381struct snd_soc_dai davinci_i2s_dai = {
382 .name = "davinci-i2s", 382 .name = "davinci-i2s",
383 .id = 0, 383 .id = 0,
384 .type = SND_SOC_DAI_I2S, 384 .type = SND_SOC_DAI_I2S,
diff --git a/sound/soc/davinci/davinci-i2s.h b/sound/soc/davinci/davinci-i2s.h
index 9592d17db320..c5b091807eec 100644
--- a/sound/soc/davinci/davinci-i2s.h
+++ b/sound/soc/davinci/davinci-i2s.h
@@ -12,6 +12,6 @@
12#ifndef _DAVINCI_I2S_H 12#ifndef _DAVINCI_I2S_H
13#define _DAVINCI_I2S_H 13#define _DAVINCI_I2S_H
14 14
15extern struct snd_soc_cpu_dai davinci_i2s_dai; 15extern struct snd_soc_dai davinci_i2s_dai;
16 16
17#endif 17#endif
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
index 6a76927c9971..6a5e56a782bb 100644
--- a/sound/soc/davinci/davinci-pcm.c
+++ b/sound/soc/davinci/davinci-pcm.c
@@ -350,7 +350,7 @@ static void davinci_pcm_free(struct snd_pcm *pcm)
350static u64 davinci_pcm_dmamask = 0xffffffff; 350static u64 davinci_pcm_dmamask = 0xffffffff;
351 351
352static int davinci_pcm_new(struct snd_card *card, 352static int davinci_pcm_new(struct snd_card *card,
353 struct snd_soc_codec_dai *dai, struct snd_pcm *pcm) 353 struct snd_soc_dai *dai, struct snd_pcm *pcm)
354{ 354{
355 int ret; 355 int ret;
356 356