aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8731.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-11-28 06:49:07 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-01 14:58:50 -0500
commit968a6025aa9f909d487988efb542217a126023a0 (patch)
tree570f91bce3381826d01b0b1948103f4577b05564 /sound/soc/codecs/wm8731.c
parent682d5874f3d654b5d13d9b8dd56b9e05cfadd01b (diff)
ASoC: Rename snd_soc_register_card() to snd_soc_init_card()
Currently ASoC card initialisation is completed by a function called snd_soc_register_card(). As part of the work to allow independant registration of cards, codecs and machines in ASoC v2 a new function of the same name has been added so rename the existing function to facilitate the merge of v2. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8731.c')
-rw-r--r--sound/soc/codecs/wm8731.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index c0f277053bb2..403dea13b5d9 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -545,7 +545,7 @@ static int wm8731_init(struct snd_soc_device *socdev)
545 545
546 wm8731_add_controls(codec); 546 wm8731_add_controls(codec);
547 wm8731_add_widgets(codec); 547 wm8731_add_widgets(codec);
548 ret = snd_soc_register_card(socdev); 548 ret = snd_soc_init_card(socdev);
549 if (ret < 0) { 549 if (ret < 0) {
550 printk(KERN_ERR "wm8731: failed to register card\n"); 550 printk(KERN_ERR "wm8731: failed to register card\n");
551 goto card_err; 551 goto card_err;