aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/uda1380.c
diff options
context:
space:
mode:
authorLiam Girdwood <lg@opensource.wolfsonmicro.com>2008-07-07 11:07:52 -0400
committerJaroslav Kysela <perex@perex.cz>2008-07-10 03:32:39 -0400
commite550e17ffeb8cf8db27724eaf2ad05f77388afb9 (patch)
tree0c73c0d1e42ce77b049f8d4c39ce1937f5256eca /sound/soc/codecs/uda1380.c
parent9cb132d743cf39b3bbe4288e9035217e7237a0bb (diff)
ALSA: asoc: codecs - 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 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>
Diffstat (limited to 'sound/soc/codecs/uda1380.c')
-rw-r--r--sound/soc/codecs/uda1380.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index 6d5335b14d51..a52d6d9e007a 100644
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
@@ -372,7 +372,7 @@ static int uda1380_add_widgets(struct snd_soc_codec *codec)
372 return 0; 372 return 0;
373} 373}
374 374
375static int uda1380_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 375static int uda1380_set_dai_fmt(struct snd_soc_dai *codec_dai,
376 unsigned int fmt) 376 unsigned int fmt)
377{ 377{
378 struct snd_soc_codec *codec = codec_dai->codec; 378 struct snd_soc_codec *codec = codec_dai->codec;
@@ -499,7 +499,7 @@ static void uda1380_pcm_shutdown(struct snd_pcm_substream *substream)
499 uda1380_write(codec, UDA1380_CLK, clk); 499 uda1380_write(codec, UDA1380_CLK, clk);
500} 500}
501 501
502static int uda1380_mute(struct snd_soc_codec_dai *codec_dai, int mute) 502static int uda1380_mute(struct snd_soc_dai *codec_dai, int mute)
503{ 503{
504 struct snd_soc_codec *codec = codec_dai->codec; 504 struct snd_soc_codec *codec = codec_dai->codec;
505 u16 mute_reg = uda1380_read_reg_cache(codec, UDA1380_DEEMP) & ~R13_MTM; 505 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,
542 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\ 542 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\
543 SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) 543 SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
544 544
545struct snd_soc_codec_dai uda1380_dai[] = { 545struct snd_soc_dai uda1380_dai[] = {
546{ 546{
547 .name = "UDA1380", 547 .name = "UDA1380",
548 .playback = { 548 .playback = {