OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Liam Girdwood 2008-07-07 16:07:42 +01:00 committed by Jaroslav Kysela
parent d37ae539a1
commit 9cb132d743
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/davinci/davinci-evm.c
View File

@ -33,8 +33,8 @@ static int evm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
int ret = 0; int ret = 0;
/* set codec DAI configuration */ /* set codec DAI configuration */

14
sound/soc/davinci/davinci-i2s.c
View 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) static int davinci_i2s_startup(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; 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; struct davinci_mcbsp_dev *dev = rtd->dai->cpu_dai->private_data;
cpu_dai->dma_data = dev->dma_params[substream->stream]; 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; 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) unsigned int fmt)
{ {
struct davinci_mcbsp_dev *dev = cpu_dai->private_data; 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, 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_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_machine *machine = socdev->machine; 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 davinci_mcbsp_dev *dev;
struct resource *mem, *ioarea; struct resource *mem, *ioarea;
struct evm_snd_platform_data *pdata; struct evm_snd_platform_data *pdata;
@ -358,11 +358,11 @@ err_release_region:
} }
static void davinci_i2s_remove(struct platform_device *pdev, 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_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_machine *machine = socdev->machine; 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 davinci_mcbsp_dev *dev = cpu_dai->private_data;
struct resource *mem; 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 #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", .name = "davinci-i2s",
.id = 0, .id = 0,
.type = SND_SOC_DAI_I2S, .type = SND_SOC_DAI_I2S,

2
sound/soc/davinci/davinci-i2s.h
View File

@ -12,6 +12,6 @@
#ifndef _DAVINCI_I2S_H #ifndef _DAVINCI_I2S_H
#define _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 #endif

2
sound/soc/davinci/davinci-pcm.c
View File

@ -350,7 +350,7 @@ static void davinci_pcm_free(struct snd_pcm *pcm)
static u64 davinci_pcm_dmamask = 0xffffffff; static u64 davinci_pcm_dmamask = 0xffffffff;
static int davinci_pcm_new(struct snd_card *card, 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; int ret;