lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: asoc: codecs - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.

Browse Source 
This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the codec drivers.

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:52 +01:00
committed by Jaroslav Kysela
parent 9cb132d743
commit e550e17ffe
24 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/codecs/uda1380.c
View File

@@ -372,7 +372,7 @@ static int uda1380_add_widgets(struct snd_soc_codec *codec)
return 0;
}
static int uda1380_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
static int uda1380_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt)
{
struct snd_soc_codec *codec = codec_dai->codec;
@@ -499,7 +499,7 @@ static void uda1380_pcm_shutdown(struct snd_pcm_substream *substream)
uda1380_write(codec, UDA1380_CLK, clk);
}
static int uda1380_mute(struct snd_soc_codec_dai *codec_dai, int mute)
static int uda1380_mute(struct snd_soc_dai *codec_dai, int mute)
{
struct snd_soc_codec *codec = codec_dai->codec;
u16 mute_reg = uda1380_read_reg_cache(codec, UDA1380_DEEMP) & ~R13_MTM;
@@ -542,7 +542,7 @@ static int uda1380_set_bias_level(struct snd_soc_codec *codec,
SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\
SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
struct snd_soc_codec_dai uda1380_dai[] = {
struct snd_soc_dai uda1380_dai[] = {
{
.name = "UDA1380",
.playback = {