]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: asoc: davinci - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
authorLiam Girdwood <lg@opensource.wolfsonmicro.com>
Mon, 7 Jul 2008 15:07:42 +0000 (16:07 +0100)
committerJaroslav Kysela <perex@perex.cz>
Thu, 10 Jul 2008 07:32:37 +0000 (09:32 +0200)
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>
sound/soc/davinci/davinci-evm.c
sound/soc/davinci/davinci-i2s.c
sound/soc/davinci/davinci-i2s.h
sound/soc/davinci/davinci-pcm.c

index 091eae3a9631bc093ae9523ac7a575a4afebbab3..4249e6a85743f3c063a0a2c2b364bc391350f057 100644 (file)
@@ -33,8 +33,8 @@ static int evm_hw_params(struct snd_pcm_substream *substream,
                         struct snd_pcm_hw_params *params)
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
-       struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai;
+       struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
+       struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
        int ret = 0;
 
        /* set codec DAI configuration */
index c3b545ccff723c88dc46b08940cf3277bb8840f8..5ebf1ff71c4cbce6451ecd63dbe080586ac531ea 100644 (file)
@@ -147,7 +147,7 @@ static void davinci_mcbsp_stop(struct snd_pcm_substream *substream)
 static int davinci_i2s_startup(struct snd_pcm_substream *substream)
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai;
+       struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
        struct davinci_mcbsp_dev *dev = rtd->dai->cpu_dai->private_data;
 
        cpu_dai->dma_data = dev->dma_params[substream->stream];
@@ -155,7 +155,7 @@ static int davinci_i2s_startup(struct snd_pcm_substream *substream)
        return 0;
 }
 
-static int davinci_i2s_set_dai_fmt(struct snd_soc_cpu_dai *cpu_dai,
+static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                                   unsigned int fmt)
 {
        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)
 }
 
 static int davinci_i2s_probe(struct platform_device *pdev,
-                            struct snd_soc_cpu_dai *dai)
+                            struct snd_soc_dai *dai)
 {
        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
        struct snd_soc_machine *machine = socdev->machine;
-       struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai;
+       struct snd_soc_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai;
        struct davinci_mcbsp_dev *dev;
        struct resource *mem, *ioarea;
        struct evm_snd_platform_data *pdata;
@@ -358,11 +358,11 @@ err_release_region:
 }
 
 static void davinci_i2s_remove(struct platform_device *pdev,
-                              struct snd_soc_cpu_dai *dai)
+                              struct snd_soc_dai *dai)
 {
        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
        struct snd_soc_machine *machine = socdev->machine;
-       struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai;
+       struct snd_soc_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai;
        struct davinci_mcbsp_dev *dev = cpu_dai->private_data;
        struct resource *mem;
 
@@ -378,7 +378,7 @@ static void davinci_i2s_remove(struct platform_device *pdev,
 
 #define DAVINCI_I2S_RATES      SNDRV_PCM_RATE_8000_96000
 
-struct snd_soc_cpu_dai davinci_i2s_dai = {
+struct snd_soc_dai davinci_i2s_dai = {
        .name = "davinci-i2s",
        .id = 0,
        .type = SND_SOC_DAI_I2S,
index 9592d17db320c88524901eebcf6da5ef9bb518fc..c5b091807eecf891bb71baa1a208933da3c62a17 100644 (file)
@@ -12,6 +12,6 @@
 #ifndef _DAVINCI_I2S_H
 #define _DAVINCI_I2S_H
 
-extern struct snd_soc_cpu_dai davinci_i2s_dai;
+extern struct snd_soc_dai davinci_i2s_dai;
 
 #endif
index 6a76927c997144c4d6dcbd1e0e317c7d39c82c62..6a5e56a782bb2f9a13551aa3365a6b2b7db85e4a 100644 (file)
@@ -350,7 +350,7 @@ static void davinci_pcm_free(struct snd_pcm *pcm)
 static u64 davinci_pcm_dmamask = 0xffffffff;
 
 static int davinci_pcm_new(struct snd_card *card,
-                          struct snd_soc_codec_dai *dai, struct snd_pcm *pcm)
+                          struct snd_soc_dai *dai, struct snd_pcm *pcm)
 {
        int ret;