diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-11-28 06:49:07 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-01 14:58:50 -0500 |
commit | 968a6025aa9f909d487988efb542217a126023a0 (patch) | |
tree | 570f91bce3381826d01b0b1948103f4577b05564 /sound/soc/codecs/wm8990.c | |
parent | 682d5874f3d654b5d13d9b8dd56b9e05cfadd01b (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/wm8990.c')
-rw-r--r-- | sound/soc/codecs/wm8990.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index 13926516d16e..5c5128b6b453 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c | |||
@@ -1462,7 +1462,7 @@ static int wm8990_init(struct snd_soc_device *socdev) | |||
1462 | 1462 | ||
1463 | wm8990_add_controls(codec); | 1463 | wm8990_add_controls(codec); |
1464 | wm8990_add_widgets(codec); | 1464 | wm8990_add_widgets(codec); |
1465 | ret = snd_soc_register_card(socdev); | 1465 | ret = snd_soc_init_card(socdev); |
1466 | if (ret < 0) { | 1466 | if (ret < 0) { |
1467 | printk(KERN_ERR "wm8990: failed to register card\n"); | 1467 | printk(KERN_ERR "wm8990: failed to register card\n"); |
1468 | goto card_err; | 1468 | goto card_err; |