aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
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
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')
-rw-r--r--sound/soc/codecs/ac97.c2
-rw-r--r--sound/soc/codecs/ac97.h2
-rw-r--r--sound/soc/codecs/ak4535.c8
-rw-r--r--sound/soc/codecs/ak4535.h2
-rw-r--r--sound/soc/codecs/cs4270.c8
-rw-r--r--sound/soc/codecs/cs4270.h2
-rw-r--r--sound/soc/codecs/tlv320aic3x.c8
-rw-r--r--sound/soc/codecs/tlv320aic3x.h2
-rw-r--r--sound/soc/codecs/uda1380.c6
-rw-r--r--sound/soc/codecs/uda1380.h2
-rw-r--r--sound/soc/codecs/wm8510.c10
-rw-r--r--sound/soc/codecs/wm8510.h2
-rw-r--r--sound/soc/codecs/wm8731.c8
-rw-r--r--sound/soc/codecs/wm8731.h2
-rw-r--r--sound/soc/codecs/wm8750.c8
-rw-r--r--sound/soc/codecs/wm8750.h2
-rw-r--r--sound/soc/codecs/wm8753.c28
-rw-r--r--sound/soc/codecs/wm8753.h2
-rw-r--r--sound/soc/codecs/wm8990.c12
-rw-r--r--sound/soc/codecs/wm8990.h2
-rw-r--r--sound/soc/codecs/wm9712.c2
-rw-r--r--sound/soc/codecs/wm9712.h2
-rw-r--r--sound/soc/codecs/wm9713.c10
-rw-r--r--sound/soc/codecs/wm9713.h2
24 files changed, 67 insertions, 67 deletions
diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c
index e4516f3ce64..61fd96ca7bc 100644
--- a/sound/soc/codecs/ac97.c
+++ b/sound/soc/codecs/ac97.c
@@ -41,7 +41,7 @@ static int ac97_prepare(struct snd_pcm_substream *substream)
41 SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 |\ 41 SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 |\
42 SNDRV_PCM_RATE_48000) 42 SNDRV_PCM_RATE_48000)
43 43
44struct snd_soc_codec_dai ac97_dai = { 44struct snd_soc_dai ac97_dai = {
45 .name = "AC97 HiFi", 45 .name = "AC97 HiFi",
46 .type = SND_SOC_DAI_AC97, 46 .type = SND_SOC_DAI_AC97,
47 .playback = { 47 .playback = {
diff --git a/sound/soc/codecs/ac97.h b/sound/soc/codecs/ac97.h
index 2bf6d69fd06..281aa42e2bb 100644
--- a/sound/soc/codecs/ac97.h
+++ b/sound/soc/codecs/ac97.h
@@ -14,6 +14,6 @@
14#define __LINUX_SND_SOC_AC97_H 14#define __LINUX_SND_SOC_AC97_H
15 15
16extern struct snd_soc_codec_device soc_codec_dev_ac97; 16extern struct snd_soc_codec_device soc_codec_dev_ac97;
17extern struct snd_soc_codec_dai ac97_dai; 17extern struct snd_soc_dai ac97_dai;
18 18
19#endif 19#endif
diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c
index 469266e881d..b26003c4f3e 100644
--- a/sound/soc/codecs/ak4535.c
+++ b/sound/soc/codecs/ak4535.c
@@ -329,7 +329,7 @@ static int ak4535_add_widgets(struct snd_soc_codec *codec)
329 return 0; 329 return 0;
330} 330}
331 331
332static int ak4535_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, 332static int ak4535_set_dai_sysclk(struct snd_soc_dai *codec_dai,
333 int clk_id, unsigned int freq, int dir) 333 int clk_id, unsigned int freq, int dir)
334{ 334{
335 struct snd_soc_codec *codec = codec_dai->codec; 335 struct snd_soc_codec *codec = codec_dai->codec;
@@ -369,7 +369,7 @@ static int ak4535_hw_params(struct snd_pcm_substream *substream,
369 return 0; 369 return 0;
370} 370}
371 371
372static int ak4535_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 372static int ak4535_set_dai_fmt(struct snd_soc_dai *codec_dai,
373 unsigned int fmt) 373 unsigned int fmt)
374{ 374{
375 struct snd_soc_codec *codec = codec_dai->codec; 375 struct snd_soc_codec *codec = codec_dai->codec;
@@ -394,7 +394,7 @@ static int ak4535_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
394 return 0; 394 return 0;
395} 395}
396 396
397static int ak4535_mute(struct snd_soc_codec_dai *dai, int mute) 397static int ak4535_mute(struct snd_soc_dai *dai, int mute)
398{ 398{
399 struct snd_soc_codec *codec = dai->codec; 399 struct snd_soc_codec *codec = dai->codec;
400 u16 mute_reg = ak4535_read_reg_cache(codec, AK4535_DAC) & 0xffdf; 400 u16 mute_reg = ak4535_read_reg_cache(codec, AK4535_DAC) & 0xffdf;
@@ -436,7 +436,7 @@ static int ak4535_set_bias_level(struct snd_soc_codec *codec,
436 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\ 436 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\
437 SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) 437 SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
438 438
439struct snd_soc_codec_dai ak4535_dai = { 439struct snd_soc_dai ak4535_dai = {
440 .name = "AK4535", 440 .name = "AK4535",
441 .playback = { 441 .playback = {
442 .stream_name = "Playback", 442 .stream_name = "Playback",
diff --git a/sound/soc/codecs/ak4535.h b/sound/soc/codecs/ak4535.h
index fc686ddf753..e9fe30e2c05 100644
--- a/sound/soc/codecs/ak4535.h
+++ b/sound/soc/codecs/ak4535.h
@@ -40,7 +40,7 @@ struct ak4535_setup_data {
40 unsigned short i2c_address; 40 unsigned short i2c_address;
41}; 41};
42 42
43extern struct snd_soc_codec_dai ak4535_dai; 43extern struct snd_soc_dai ak4535_dai;
44extern struct snd_soc_codec_device soc_codec_dev_ak4535; 44extern struct snd_soc_codec_device soc_codec_dev_ak4535;
45 45
46#endif 46#endif
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index e73fcfd9f5c..9deb8c74fdf 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -201,7 +201,7 @@ static struct {
201 * driver what the input settings can be. This would need to be implemented 201 * driver what the input settings can be. This would need to be implemented
202 * for stand-alone mode to work. 202 * for stand-alone mode to work.
203 */ 203 */
204static int cs4270_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, 204static int cs4270_set_dai_sysclk(struct snd_soc_dai *codec_dai,
205 int clk_id, unsigned int freq, int dir) 205 int clk_id, unsigned int freq, int dir)
206{ 206{
207 struct snd_soc_codec *codec = codec_dai->codec; 207 struct snd_soc_codec *codec = codec_dai->codec;
@@ -251,7 +251,7 @@ static int cs4270_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
251 * data for playback only, but ASoC currently does not support different 251 * data for playback only, but ASoC currently does not support different
252 * formats for playback vs. record. 252 * formats for playback vs. record.
253 */ 253 */
254static int cs4270_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 254static int cs4270_set_dai_fmt(struct snd_soc_dai *codec_dai,
255 unsigned int format) 255 unsigned int format)
256{ 256{
257 struct snd_soc_codec *codec = codec_dai->codec; 257 struct snd_soc_codec *codec = codec_dai->codec;
@@ -471,7 +471,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream,
471 * board does not have the MUTEA or MUTEB pins connected to such circuitry, 471 * board does not have the MUTEA or MUTEB pins connected to such circuitry,
472 * then this function will do nothing. 472 * then this function will do nothing.
473 */ 473 */
474static int cs4270_mute(struct snd_soc_codec_dai *dai, int mute) 474static int cs4270_mute(struct snd_soc_dai *dai, int mute)
475{ 475{
476 struct snd_soc_codec *codec = dai->codec; 476 struct snd_soc_codec *codec = dai->codec;
477 int reg6; 477 int reg6;
@@ -667,7 +667,7 @@ error:
667 667
668#endif /* USE_I2C*/ 668#endif /* USE_I2C*/
669 669
670struct snd_soc_codec_dai cs4270_dai = { 670struct snd_soc_dai cs4270_dai = {
671 .name = "CS4270", 671 .name = "CS4270",
672 .playback = { 672 .playback = {
673 .stream_name = "Playback", 673 .stream_name = "Playback",
diff --git a/sound/soc/codecs/cs4270.h b/sound/soc/codecs/cs4270.h
index 0ced49b7804..adc6cd9667d 100644
--- a/sound/soc/codecs/cs4270.h
+++ b/sound/soc/codecs/cs4270.h
@@ -16,7 +16,7 @@
16 * The ASoC codec DAI structure for the CS4270. Assign this structure to 16 * The ASoC codec DAI structure for the CS4270. Assign this structure to
17 * the .codec_dai field of your machine driver's snd_soc_dai_link structure. 17 * the .codec_dai field of your machine driver's snd_soc_dai_link structure.
18 */ 18 */
19extern struct snd_soc_codec_dai cs4270_dai; 19extern struct snd_soc_dai cs4270_dai;
20 20
21/* 21/*
22 * The ASoC codec device structure for the CS4270. Assign this structure 22 * The ASoC codec device structure for the CS4270. Assign this structure
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 954d39b7c04..b1dce5f459d 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -814,7 +814,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream,
814 return 0; 814 return 0;
815} 815}
816 816
817static int aic3x_mute(struct snd_soc_codec_dai *dai, int mute) 817static int aic3x_mute(struct snd_soc_dai *dai, int mute)
818{ 818{
819 struct snd_soc_codec *codec = dai->codec; 819 struct snd_soc_codec *codec = dai->codec;
820 u8 ldac_reg = aic3x_read_reg_cache(codec, LDAC_VOL) & ~MUTE_ON; 820 u8 ldac_reg = aic3x_read_reg_cache(codec, LDAC_VOL) & ~MUTE_ON;
@@ -831,7 +831,7 @@ static int aic3x_mute(struct snd_soc_codec_dai *dai, int mute)
831 return 0; 831 return 0;
832} 832}
833 833
834static int aic3x_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, 834static int aic3x_set_dai_sysclk(struct snd_soc_dai *codec_dai,
835 int clk_id, unsigned int freq, int dir) 835 int clk_id, unsigned int freq, int dir)
836{ 836{
837 struct snd_soc_codec *codec = codec_dai->codec; 837 struct snd_soc_codec *codec = codec_dai->codec;
@@ -841,7 +841,7 @@ static int aic3x_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
841 return 0; 841 return 0;
842} 842}
843 843
844static int aic3x_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 844static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,
845 unsigned int fmt) 845 unsigned int fmt)
846{ 846{
847 struct snd_soc_codec *codec = codec_dai->codec; 847 struct snd_soc_codec *codec = codec_dai->codec;
@@ -990,7 +990,7 @@ EXPORT_SYMBOL_GPL(aic3x_headset_detected);
990#define AIC3X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ 990#define AIC3X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
991 SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE) 991 SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE)
992 992
993struct snd_soc_codec_dai aic3x_dai = { 993struct snd_soc_dai aic3x_dai = {
994 .name = "aic3x", 994 .name = "aic3x",
995 .playback = { 995 .playback = {
996 .stream_name = "Playback", 996 .stream_name = "Playback",
diff --git a/sound/soc/codecs/tlv320aic3x.h b/sound/soc/codecs/tlv320aic3x.h
index e6009461063..d76c079b86e 100644
--- a/sound/soc/codecs/tlv320aic3x.h
+++ b/sound/soc/codecs/tlv320aic3x.h
@@ -228,7 +228,7 @@ struct aic3x_setup_data {
228 unsigned int gpio_func[2]; 228 unsigned int gpio_func[2];
229}; 229};
230 230
231extern struct snd_soc_codec_dai aic3x_dai; 231extern struct snd_soc_dai aic3x_dai;
232extern struct snd_soc_codec_device soc_codec_dev_aic3x; 232extern struct snd_soc_codec_device soc_codec_dev_aic3x;
233 233
234#endif /* _AIC3X_H */ 234#endif /* _AIC3X_H */
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index 6d5335b14d5..a52d6d9e007 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 = {
diff --git a/sound/soc/codecs/uda1380.h b/sound/soc/codecs/uda1380.h
index f9d885c8bf0..50c603e2c9f 100644
--- a/sound/soc/codecs/uda1380.h
+++ b/sound/soc/codecs/uda1380.h
@@ -83,7 +83,7 @@ struct uda1380_setup_data {
83#define UDA1380_DAI_PLAYBACK 1 /* playback DAI */ 83#define UDA1380_DAI_PLAYBACK 1 /* playback DAI */
84#define UDA1380_DAI_CAPTURE 2 /* capture DAI */ 84#define UDA1380_DAI_CAPTURE 2 /* capture DAI */
85 85
86extern struct snd_soc_codec_dai uda1380_dai[3]; 86extern struct snd_soc_dai uda1380_dai[3];
87extern struct snd_soc_codec_device soc_codec_dev_uda1380; 87extern struct snd_soc_codec_device soc_codec_dev_uda1380;
88 88
89#endif /* _UDA1380_H */ 89#endif /* _UDA1380_H */
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index b549f6753ab..67325fd9544 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -332,7 +332,7 @@ static void pll_factors(unsigned int target, unsigned int source)
332 pll_div.k = K; 332 pll_div.k = K;
333} 333}
334 334
335static int wm8510_set_dai_pll(struct snd_soc_codec_dai *codec_dai, 335static int wm8510_set_dai_pll(struct snd_soc_dai *codec_dai,
336 int pll_id, unsigned int freq_in, unsigned int freq_out) 336 int pll_id, unsigned int freq_in, unsigned int freq_out)
337{ 337{
338 struct snd_soc_codec *codec = codec_dai->codec; 338 struct snd_soc_codec *codec = codec_dai->codec;
@@ -368,7 +368,7 @@ static int wm8510_set_dai_pll(struct snd_soc_codec_dai *codec_dai,
368/* 368/*
369 * Configure WM8510 clock dividers. 369 * Configure WM8510 clock dividers.
370 */ 370 */
371static int wm8510_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai, 371static int wm8510_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
372 int div_id, int div) 372 int div_id, int div)
373{ 373{
374 struct snd_soc_codec *codec = codec_dai->codec; 374 struct snd_soc_codec *codec = codec_dai->codec;
@@ -402,7 +402,7 @@ static int wm8510_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai,
402 return 0; 402 return 0;
403} 403}
404 404
405static int wm8510_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 405static int wm8510_set_dai_fmt(struct snd_soc_dai *codec_dai,
406 unsigned int fmt) 406 unsigned int fmt)
407{ 407{
408 struct snd_soc_codec *codec = codec_dai->codec; 408 struct snd_soc_codec *codec = codec_dai->codec;
@@ -510,7 +510,7 @@ static int wm8510_pcm_hw_params(struct snd_pcm_substream *substream,
510 return 0; 510 return 0;
511} 511}
512 512
513static int wm8510_mute(struct snd_soc_codec_dai *dai, int mute) 513static int wm8510_mute(struct snd_soc_dai *dai, int mute)
514{ 514{
515 struct snd_soc_codec *codec = dai->codec; 515 struct snd_soc_codec *codec = dai->codec;
516 u16 mute_reg = wm8510_read_reg_cache(codec, WM8510_DAC) & 0xffbf; 516 u16 mute_reg = wm8510_read_reg_cache(codec, WM8510_DAC) & 0xffbf;
@@ -554,7 +554,7 @@ static int wm8510_set_bias_level(struct snd_soc_codec *codec,
554#define WM8510_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ 554#define WM8510_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
555 SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) 555 SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
556 556
557struct snd_soc_codec_dai wm8510_dai = { 557struct snd_soc_dai wm8510_dai = {
558 .name = "WM8510 HiFi", 558 .name = "WM8510 HiFi",
559 .playback = { 559 .playback = {
560 .stream_name = "Playback", 560 .stream_name = "Playback",
diff --git a/sound/soc/codecs/wm8510.h b/sound/soc/codecs/wm8510.h
index c862e7b7d53..f5d2e42eb3f 100644
--- a/sound/soc/codecs/wm8510.h
+++ b/sound/soc/codecs/wm8510.h
@@ -97,7 +97,7 @@ struct wm8510_setup_data {
97 unsigned short i2c_address; 97 unsigned short i2c_address;
98}; 98};
99 99
100extern struct snd_soc_codec_dai wm8510_dai; 100extern struct snd_soc_dai wm8510_dai;
101extern struct snd_soc_codec_device soc_codec_dev_wm8510; 101extern struct snd_soc_codec_device soc_codec_dev_wm8510;
102 102
103#endif 103#endif
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 3ff42ad65ed..369d39c3f74 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -318,7 +318,7 @@ static void wm8731_shutdown(struct snd_pcm_substream *substream)
318 } 318 }
319} 319}
320 320
321static int wm8731_mute(struct snd_soc_codec_dai *dai, int mute) 321static int wm8731_mute(struct snd_soc_dai *dai, int mute)
322{ 322{
323 struct snd_soc_codec *codec = dai->codec; 323 struct snd_soc_codec *codec = dai->codec;
324 u16 mute_reg = wm8731_read_reg_cache(codec, WM8731_APDIGI) & 0xfff7; 324 u16 mute_reg = wm8731_read_reg_cache(codec, WM8731_APDIGI) & 0xfff7;
@@ -330,7 +330,7 @@ static int wm8731_mute(struct snd_soc_codec_dai *dai, int mute)
330 return 0; 330 return 0;
331} 331}
332 332
333static int wm8731_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, 333static int wm8731_set_dai_sysclk(struct snd_soc_dai *codec_dai,
334 int clk_id, unsigned int freq, int dir) 334 int clk_id, unsigned int freq, int dir)
335{ 335{
336 struct snd_soc_codec *codec = codec_dai->codec; 336 struct snd_soc_codec *codec = codec_dai->codec;
@@ -349,7 +349,7 @@ static int wm8731_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
349} 349}
350 350
351 351
352static int wm8731_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 352static int wm8731_set_dai_fmt(struct snd_soc_dai *codec_dai,
353 unsigned int fmt) 353 unsigned int fmt)
354{ 354{
355 struct snd_soc_codec *codec = codec_dai->codec; 355 struct snd_soc_codec *codec = codec_dai->codec;
@@ -443,7 +443,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
443#define WM8731_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ 443#define WM8731_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
444 SNDRV_PCM_FMTBIT_S24_LE) 444 SNDRV_PCM_FMTBIT_S24_LE)
445 445
446struct snd_soc_codec_dai wm8731_dai = { 446struct snd_soc_dai wm8731_dai = {
447 .name = "WM8731", 447 .name = "WM8731",
448 .playback = { 448 .playback = {
449 .stream_name = "Playback", 449 .stream_name = "Playback",
diff --git a/sound/soc/codecs/wm8731.h b/sound/soc/codecs/wm8731.h
index 5bcab6a7afb..99f2e3c60e3 100644
--- a/sound/soc/codecs/wm8731.h
+++ b/sound/soc/codecs/wm8731.h
@@ -38,7 +38,7 @@ struct wm8731_setup_data {
38 unsigned short i2c_address; 38 unsigned short i2c_address;
39}; 39};
40 40
41extern struct snd_soc_codec_dai wm8731_dai; 41extern struct snd_soc_dai wm8731_dai;
42extern struct snd_soc_codec_device soc_codec_dev_wm8731; 42extern struct snd_soc_codec_device soc_codec_dev_wm8731;
43 43
44#endif 44#endif
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index eb460c9aa63..e23cb09f0d1 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -536,7 +536,7 @@ static inline int get_coeff(int mclk, int rate)
536 return -EINVAL; 536 return -EINVAL;
537} 537}
538 538
539static int wm8750_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, 539static int wm8750_set_dai_sysclk(struct snd_soc_dai *codec_dai,
540 int clk_id, unsigned int freq, int dir) 540 int clk_id, unsigned int freq, int dir)
541{ 541{
542 struct snd_soc_codec *codec = codec_dai->codec; 542 struct snd_soc_codec *codec = codec_dai->codec;
@@ -554,7 +554,7 @@ static int wm8750_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
554 return -EINVAL; 554 return -EINVAL;
555} 555}
556 556
557static int wm8750_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 557static int wm8750_set_dai_fmt(struct snd_soc_dai *codec_dai,
558 unsigned int fmt) 558 unsigned int fmt)
559{ 559{
560 struct snd_soc_codec *codec = codec_dai->codec; 560 struct snd_soc_codec *codec = codec_dai->codec;
@@ -647,7 +647,7 @@ static int wm8750_pcm_hw_params(struct snd_pcm_substream *substream,
647 return 0; 647 return 0;
648} 648}
649 649
650static int wm8750_mute(struct snd_soc_codec_dai *dai, int mute) 650static int wm8750_mute(struct snd_soc_dai *dai, int mute)
651{ 651{
652 struct snd_soc_codec *codec = dai->codec; 652 struct snd_soc_codec *codec = dai->codec;
653 u16 mute_reg = wm8750_read_reg_cache(codec, WM8750_ADCDAC) & 0xfff7; 653 u16 mute_reg = wm8750_read_reg_cache(codec, WM8750_ADCDAC) & 0xfff7;
@@ -692,7 +692,7 @@ static int wm8750_set_bias_level(struct snd_soc_codec *codec,
692#define WM8750_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ 692#define WM8750_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
693 SNDRV_PCM_FMTBIT_S24_LE) 693 SNDRV_PCM_FMTBIT_S24_LE)
694 694
695struct snd_soc_codec_dai wm8750_dai = { 695struct snd_soc_dai wm8750_dai = {
696 .name = "WM8750", 696 .name = "WM8750",
697 .playback = { 697 .playback = {
698 .stream_name = "Playback", 698 .stream_name = "Playback",
diff --git a/sound/soc/codecs/wm8750.h b/sound/soc/codecs/wm8750.h
index a97a54a6348..8ef30e628b2 100644
--- a/sound/soc/codecs/wm8750.h
+++ b/sound/soc/codecs/wm8750.h
@@ -61,7 +61,7 @@ struct wm8750_setup_data {
61 unsigned short i2c_address; 61 unsigned short i2c_address;
62}; 62};
63 63
64extern struct snd_soc_codec_dai wm8750_dai; 64extern struct snd_soc_dai wm8750_dai;
65extern struct snd_soc_codec_device soc_codec_dev_wm8750; 65extern struct snd_soc_codec_device soc_codec_dev_wm8750;
66 66
67#endif 67#endif
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index be01a738f18..8604809f0c3 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -740,7 +740,7 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target,
740 pll_div->k = K; 740 pll_div->k = K;
741} 741}
742 742
743static int wm8753_set_dai_pll(struct snd_soc_codec_dai *codec_dai, 743static int wm8753_set_dai_pll(struct snd_soc_dai *codec_dai,
744 int pll_id, unsigned int freq_in, unsigned int freq_out) 744 int pll_id, unsigned int freq_in, unsigned int freq_out)
745{ 745{
746 u16 reg, enable; 746 u16 reg, enable;
@@ -863,7 +863,7 @@ static int get_coeff(int mclk, int rate)
863/* 863/*
864 * Clock after PLL and dividers 864 * Clock after PLL and dividers
865 */ 865 */
866static int wm8753_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, 866static int wm8753_set_dai_sysclk(struct snd_soc_dai *codec_dai,
867 int clk_id, unsigned int freq, int dir) 867 int clk_id, unsigned int freq, int dir)
868{ 868{
869 struct snd_soc_codec *codec = codec_dai->codec; 869 struct snd_soc_codec *codec = codec_dai->codec;
@@ -890,7 +890,7 @@ static int wm8753_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
890/* 890/*
891 * Set's ADC and Voice DAC format. 891 * Set's ADC and Voice DAC format.
892 */ 892 */
893static int wm8753_vdac_adc_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 893static int wm8753_vdac_adc_set_dai_fmt(struct snd_soc_dai *codec_dai,
894 unsigned int fmt) 894 unsigned int fmt)
895{ 895{
896 struct snd_soc_codec *codec = codec_dai->codec; 896 struct snd_soc_codec *codec = codec_dai->codec;
@@ -960,7 +960,7 @@ static int wm8753_pcm_hw_params(struct snd_pcm_substream *substream,
960/* 960/*
961 * Set's PCM dai fmt and BCLK. 961 * Set's PCM dai fmt and BCLK.
962 */ 962 */
963static int wm8753_pcm_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 963static int wm8753_pcm_set_dai_fmt(struct snd_soc_dai *codec_dai,
964 unsigned int fmt) 964 unsigned int fmt)
965{ 965{
966 struct snd_soc_codec *codec = codec_dai->codec; 966 struct snd_soc_codec *codec = codec_dai->codec;
@@ -1026,7 +1026,7 @@ static int wm8753_pcm_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
1026 return 0; 1026 return 0;
1027} 1027}
1028 1028
1029static int wm8753_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai, 1029static int wm8753_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
1030 int div_id, int div) 1030 int div_id, int div)
1031{ 1031{
1032 struct snd_soc_codec *codec = codec_dai->codec; 1032 struct snd_soc_codec *codec = codec_dai->codec;
@@ -1054,7 +1054,7 @@ static int wm8753_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai,
1054/* 1054/*
1055 * Set's HiFi DAC format. 1055 * Set's HiFi DAC format.
1056 */ 1056 */
1057static int wm8753_hdac_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 1057static int wm8753_hdac_set_dai_fmt(struct snd_soc_dai *codec_dai,
1058 unsigned int fmt) 1058 unsigned int fmt)
1059{ 1059{
1060 struct snd_soc_codec *codec = codec_dai->codec; 1060 struct snd_soc_codec *codec = codec_dai->codec;
@@ -1087,7 +1087,7 @@ static int wm8753_hdac_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
1087/* 1087/*
1088 * Set's I2S DAI format. 1088 * Set's I2S DAI format.
1089 */ 1089 */
1090static int wm8753_i2s_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 1090static int wm8753_i2s_set_dai_fmt(struct snd_soc_dai *codec_dai,
1091 unsigned int fmt) 1091 unsigned int fmt)
1092{ 1092{
1093 struct snd_soc_codec *codec = codec_dai->codec; 1093 struct snd_soc_codec *codec = codec_dai->codec;
@@ -1195,7 +1195,7 @@ static int wm8753_i2s_hw_params(struct snd_pcm_substream *substream,
1195 return 0; 1195 return 0;
1196} 1196}
1197 1197
1198static int wm8753_mode1v_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 1198static int wm8753_mode1v_set_dai_fmt(struct snd_soc_dai *codec_dai,
1199 unsigned int fmt) 1199 unsigned int fmt)
1200{ 1200{
1201 struct snd_soc_codec *codec = codec_dai->codec; 1201 struct snd_soc_codec *codec = codec_dai->codec;
@@ -1210,7 +1210,7 @@ static int wm8753_mode1v_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
1210 return wm8753_pcm_set_dai_fmt(codec_dai, fmt); 1210 return wm8753_pcm_set_dai_fmt(codec_dai, fmt);
1211} 1211}
1212 1212
1213static int wm8753_mode1h_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 1213static int wm8753_mode1h_set_dai_fmt(struct snd_soc_dai *codec_dai,
1214 unsigned int fmt) 1214 unsigned int fmt)
1215{ 1215{
1216 if (wm8753_hdac_set_dai_fmt(codec_dai, fmt) < 0) 1216 if (wm8753_hdac_set_dai_fmt(codec_dai, fmt) < 0)
@@ -1218,7 +1218,7 @@ static int wm8753_mode1h_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
1218 return wm8753_i2s_set_dai_fmt(codec_dai, fmt); 1218 return wm8753_i2s_set_dai_fmt(codec_dai, fmt);
1219} 1219}
1220 1220
1221static int wm8753_mode2_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 1221static int wm8753_mode2_set_dai_fmt(struct snd_soc_dai *codec_dai,
1222 unsigned int fmt) 1222 unsigned int fmt)
1223{ 1223{
1224 struct snd_soc_codec *codec = codec_dai->codec; 1224 struct snd_soc_codec *codec = codec_dai->codec;
@@ -1233,7 +1233,7 @@ static int wm8753_mode2_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
1233 return wm8753_i2s_set_dai_fmt(codec_dai, fmt); 1233 return wm8753_i2s_set_dai_fmt(codec_dai, fmt);
1234} 1234}
1235 1235
1236static int wm8753_mode3_4_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 1236static int wm8753_mode3_4_set_dai_fmt(struct snd_soc_dai *codec_dai,
1237 unsigned int fmt) 1237 unsigned int fmt)
1238{ 1238{
1239 struct snd_soc_codec *codec = codec_dai->codec; 1239 struct snd_soc_codec *codec = codec_dai->codec;
@@ -1250,7 +1250,7 @@ static int wm8753_mode3_4_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
1250 return wm8753_i2s_set_dai_fmt(codec_dai, fmt); 1250 return wm8753_i2s_set_dai_fmt(codec_dai, fmt);
1251} 1251}
1252 1252
1253static int wm8753_mute(struct snd_soc_codec_dai *dai, int mute) 1253static int wm8753_mute(struct snd_soc_dai *dai, int mute)
1254{ 1254{
1255 struct snd_soc_codec *codec = dai->codec; 1255 struct snd_soc_codec *codec = dai->codec;
1256 u16 mute_reg = wm8753_read_reg_cache(codec, WM8753_DAC) & 0xfff7; 1256 u16 mute_reg = wm8753_read_reg_cache(codec, WM8753_DAC) & 0xfff7;
@@ -1316,7 +1316,7 @@ static int wm8753_set_bias_level(struct snd_soc_codec *codec,
1316 * 3. Voice disabled - HIFI over HIFI 1316 * 3. Voice disabled - HIFI over HIFI
1317 * 4. Voice disabled - HIFI over HIFI, uses voice DAI LRC for capture 1317 * 4. Voice disabled - HIFI over HIFI, uses voice DAI LRC for capture
1318 */ 1318 */
1319static const struct snd_soc_codec_dai wm8753_all_dai[] = { 1319static const struct snd_soc_dai wm8753_all_dai[] = {
1320/* DAI HiFi mode 1 */ 1320/* DAI HiFi mode 1 */
1321{ .name = "WM8753 HiFi", 1321{ .name = "WM8753 HiFi",
1322 .id = 1, 1322 .id = 1,
@@ -1456,7 +1456,7 @@ static const struct snd_soc_codec_dai wm8753_all_dai[] = {
1456}, 1456},
1457}; 1457};
1458 1458
1459struct snd_soc_codec_dai wm8753_dai[2]; 1459struct snd_soc_dai wm8753_dai[2];
1460EXPORT_SYMBOL_GPL(wm8753_dai); 1460EXPORT_SYMBOL_GPL(wm8753_dai);
1461 1461
1462static void wm8753_set_dai_mode(struct snd_soc_codec *codec, unsigned int mode) 1462static void wm8753_set_dai_mode(struct snd_soc_codec *codec, unsigned int mode)
diff --git a/sound/soc/codecs/wm8753.h b/sound/soc/codecs/wm8753.h
index 95e2a1f5316..44f5f1ff0cc 100644
--- a/sound/soc/codecs/wm8753.h
+++ b/sound/soc/codecs/wm8753.h
@@ -120,7 +120,7 @@ struct wm8753_setup_data {
120#define WM8753_DAI_HIFI 0 120#define WM8753_DAI_HIFI 0
121#define WM8753_DAI_VOICE 1 121#define WM8753_DAI_VOICE 1
122 122
123extern struct snd_soc_codec_dai wm8753_dai[2]; 123extern struct snd_soc_dai wm8753_dai[2];
124extern struct snd_soc_codec_device soc_codec_dev_wm8753; 124extern struct snd_soc_codec_device soc_codec_dev_wm8753;
125 125
126#endif 126#endif
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index a1371b73ba7..3ecce5168e9 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -1029,7 +1029,7 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target,
1029 pll_div->k = K; 1029 pll_div->k = K;
1030} 1030}
1031 1031
1032static int wm8990_set_dai_pll(struct snd_soc_codec_dai *codec_dai, 1032static int wm8990_set_dai_pll(struct snd_soc_dai *codec_dai,
1033 int pll_id, unsigned int freq_in, unsigned int freq_out) 1033 int pll_id, unsigned int freq_in, unsigned int freq_out)
1034{ 1034{
1035 u16 reg; 1035 u16 reg;
@@ -1065,7 +1065,7 @@ static int wm8990_set_dai_pll(struct snd_soc_codec_dai *codec_dai,
1065/* 1065/*
1066 * Clock after PLL and dividers 1066 * Clock after PLL and dividers
1067 */ 1067 */
1068static int wm8990_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, 1068static int wm8990_set_dai_sysclk(struct snd_soc_dai *codec_dai,
1069 int clk_id, unsigned int freq, int dir) 1069 int clk_id, unsigned int freq, int dir)
1070{ 1070{
1071 struct snd_soc_codec *codec = codec_dai->codec; 1071 struct snd_soc_codec *codec = codec_dai->codec;
@@ -1078,7 +1078,7 @@ static int wm8990_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
1078/* 1078/*
1079 * Set's ADC and Voice DAC format. 1079 * Set's ADC and Voice DAC format.
1080 */ 1080 */
1081static int wm8990_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 1081static int wm8990_set_dai_fmt(struct snd_soc_dai *codec_dai,
1082 unsigned int fmt) 1082 unsigned int fmt)
1083{ 1083{
1084 struct snd_soc_codec *codec = codec_dai->codec; 1084 struct snd_soc_codec *codec = codec_dai->codec;
@@ -1131,7 +1131,7 @@ static int wm8990_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
1131 return 0; 1131 return 0;
1132} 1132}
1133 1133
1134static int wm8990_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai, 1134static int wm8990_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
1135 int div_id, int div) 1135 int div_id, int div)
1136{ 1136{
1137 struct snd_soc_codec *codec = codec_dai->codec; 1137 struct snd_soc_codec *codec = codec_dai->codec;
@@ -1196,7 +1196,7 @@ static int wm8990_hw_params(struct snd_pcm_substream *substream,
1196 return 0; 1196 return 0;
1197} 1197}
1198 1198
1199static int wm8990_mute(struct snd_soc_codec_dai *dai, int mute) 1199static int wm8990_mute(struct snd_soc_dai *dai, int mute)
1200{ 1200{
1201 struct snd_soc_codec *codec = dai->codec; 1201 struct snd_soc_codec *codec = dai->codec;
1202 u16 val; 1202 u16 val;
@@ -1329,7 +1329,7 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
1329 * 1. ADC/DAC on Primary Interface 1329 * 1. ADC/DAC on Primary Interface
1330 * 2. ADC on Primary Interface/DAC on secondary 1330 * 2. ADC on Primary Interface/DAC on secondary
1331 */ 1331 */
1332struct snd_soc_codec_dai wm8990_dai = { 1332struct snd_soc_dai wm8990_dai = {
1333/* ADC/DAC on primary */ 1333/* ADC/DAC on primary */
1334 .name = "WM8990 ADC/DAC Primary", 1334 .name = "WM8990 ADC/DAC Primary",
1335 .id = 1, 1335 .id = 1,
diff --git a/sound/soc/codecs/wm8990.h b/sound/soc/codecs/wm8990.h
index bf9f8823dfc..6bea5748528 100644
--- a/sound/soc/codecs/wm8990.h
+++ b/sound/soc/codecs/wm8990.h
@@ -825,7 +825,7 @@ struct wm8990_setup_data {
825#define WM8990_ADCCLK_DIV 2 825#define WM8990_ADCCLK_DIV 2
826#define WM8990_BCLK_DIV 3 826#define WM8990_BCLK_DIV 3
827 827
828extern struct snd_soc_codec_dai wm8990_dai; 828extern struct snd_soc_dai wm8990_dai;
829extern struct snd_soc_codec_device soc_codec_dev_wm8990; 829extern struct snd_soc_codec_device soc_codec_dev_wm8990;
830 830
831#endif /* __WM8990REGISTERDEFS_H__ */ 831#endif /* __WM8990REGISTERDEFS_H__ */
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 47390113bd0..9fc8edd8222 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -532,7 +532,7 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream)
532 SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 |\ 532 SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 |\
533 SNDRV_PCM_RATE_48000) 533 SNDRV_PCM_RATE_48000)
534 534
535struct snd_soc_codec_dai wm9712_dai[] = { 535struct snd_soc_dai wm9712_dai[] = {
536{ 536{
537 .name = "AC97 HiFi", 537 .name = "AC97 HiFi",
538 .type = SND_SOC_DAI_AC97_BUS, 538 .type = SND_SOC_DAI_AC97_BUS,
diff --git a/sound/soc/codecs/wm9712.h b/sound/soc/codecs/wm9712.h
index 719105d61e6..d29e8a18ca6 100644
--- a/sound/soc/codecs/wm9712.h
+++ b/sound/soc/codecs/wm9712.h
@@ -8,7 +8,7 @@
8#define WM9712_DAI_AC97_HIFI 0 8#define WM9712_DAI_AC97_HIFI 0
9#define WM9712_DAI_AC97_AUX 1 9#define WM9712_DAI_AC97_AUX 1
10 10
11extern struct snd_soc_codec_dai wm9712_dai[2]; 11extern struct snd_soc_dai wm9712_dai[2];
12extern struct snd_soc_codec_device soc_codec_dev_wm9712; 12extern struct snd_soc_codec_device soc_codec_dev_wm9712;
13 13
14#endif 14#endif
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index a4806189044..38d1fe0971f 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -789,7 +789,7 @@ static int wm9713_set_pll(struct snd_soc_codec *codec,
789 return 0; 789 return 0;
790} 790}
791 791
792static int wm9713_set_dai_pll(struct snd_soc_codec_dai *codec_dai, 792static int wm9713_set_dai_pll(struct snd_soc_dai *codec_dai,
793 int pll_id, unsigned int freq_in, unsigned int freq_out) 793 int pll_id, unsigned int freq_in, unsigned int freq_out)
794{ 794{
795 struct snd_soc_codec *codec = codec_dai->codec; 795 struct snd_soc_codec *codec = codec_dai->codec;
@@ -800,7 +800,7 @@ static int wm9713_set_dai_pll(struct snd_soc_codec_dai *codec_dai,
800 * Tristate the PCM DAI lines, tristate can be disabled by calling 800 * Tristate the PCM DAI lines, tristate can be disabled by calling
801 * wm9713_set_dai_fmt() 801 * wm9713_set_dai_fmt()
802 */ 802 */
803static int wm9713_set_dai_tristate(struct snd_soc_codec_dai *codec_dai, 803static int wm9713_set_dai_tristate(struct snd_soc_dai *codec_dai,
804 int tristate) 804 int tristate)
805{ 805{
806 struct snd_soc_codec *codec = codec_dai->codec; 806 struct snd_soc_codec *codec = codec_dai->codec;
@@ -816,7 +816,7 @@ static int wm9713_set_dai_tristate(struct snd_soc_codec_dai *codec_dai,
816 * Configure WM9713 clock dividers. 816 * Configure WM9713 clock dividers.
817 * Voice DAC needs 256 FS 817 * Voice DAC needs 256 FS
818 */ 818 */
819static int wm9713_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai, 819static int wm9713_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
820 int div_id, int div) 820 int div_id, int div)
821{ 821{
822 struct snd_soc_codec *codec = codec_dai->codec; 822 struct snd_soc_codec *codec = codec_dai->codec;
@@ -858,7 +858,7 @@ static int wm9713_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai,
858 return 0; 858 return 0;
859} 859}
860 860
861static int wm9713_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, 861static int wm9713_set_dai_fmt(struct snd_soc_dai *codec_dai,
862 unsigned int fmt) 862 unsigned int fmt)
863{ 863{
864 struct snd_soc_codec *codec = codec_dai->codec; 864 struct snd_soc_codec *codec = codec_dai->codec;
@@ -1018,7 +1018,7 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream)
1018 (SNDRV_PCM_FORMAT_S16_LE | SNDRV_PCM_FORMAT_S20_3LE | \ 1018 (SNDRV_PCM_FORMAT_S16_LE | SNDRV_PCM_FORMAT_S20_3LE | \
1019 SNDRV_PCM_FORMAT_S24_LE) 1019 SNDRV_PCM_FORMAT_S24_LE)
1020 1020
1021struct snd_soc_codec_dai wm9713_dai[] = { 1021struct snd_soc_dai wm9713_dai[] = {
1022{ 1022{
1023 .name = "AC97 HiFi", 1023 .name = "AC97 HiFi",
1024 .type = SND_SOC_DAI_AC97_BUS, 1024 .type = SND_SOC_DAI_AC97_BUS,
diff --git a/sound/soc/codecs/wm9713.h b/sound/soc/codecs/wm9713.h
index d357b6c8134..63b8d81756e 100644
--- a/sound/soc/codecs/wm9713.h
+++ b/sound/soc/codecs/wm9713.h
@@ -46,7 +46,7 @@
46#define WM9713_DAI_PCM_VOICE 2 46#define WM9713_DAI_PCM_VOICE 2
47 47
48extern struct snd_soc_codec_device soc_codec_dev_wm9713; 48extern struct snd_soc_codec_device soc_codec_dev_wm9713;
49extern struct snd_soc_codec_dai wm9713_dai[3]; 49extern struct snd_soc_dai wm9713_dai[3];
50 50
51int wm9713_reset(struct snd_soc_codec *codec, int try_warm); 51int wm9713_reset(struct snd_soc_codec *codec, int try_warm);
52 52