diff options
| author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2008-07-07 16:07:37 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-10 09:32:36 +0200 |
| commit | d37ae539a1d76da8fe5a939ce8b6d818501c8716 (patch) | |
| tree | 9b1abcefb3db79747745f9a64719d7d3b4aae1c5 /sound/soc/at91/eti_b1_wm8731.c | |
| parent | 453ba20b2800bc07a3eaf220010dc0127cc552fd (diff) | |
ALSA: asoc: at91 - 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 AT91 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/at91/eti_b1_wm8731.c')
| -rw-r--r-- | sound/soc/at91/eti_b1_wm8731.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/at91/eti_b1_wm8731.c b/sound/soc/at91/eti_b1_wm8731.c index ad971e7061fe..9d4213963c26 100644 --- a/sound/soc/at91/eti_b1_wm8731.c +++ b/sound/soc/at91/eti_b1_wm8731.c @@ -53,8 +53,8 @@ static struct clk *pllb_clk; static int eti_b1_startup(struct snd_pcm_substream *substream) { 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; /* cpu clock is the AT91 master clock sent to the SSC */ @@ -87,8 +87,8 @@ static int eti_b1_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; #ifdef CONFIG_SND_AT91_SOC_ETI_SLAVE |