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/ad1980.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/ad1980.c')
-rw-r--r-- | sound/soc/codecs/ad1980.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c index a9a268112d3f..73fdbb4d4a3d 100644 --- a/sound/soc/codecs/ad1980.c +++ b/sound/soc/codecs/ad1980.c | |||
@@ -270,7 +270,7 @@ static int ad1980_soc_probe(struct platform_device *pdev) | |||
270 | ac97_write(codec, AC97_EXTENDED_STATUS, ext_status&~0x3800); | 270 | ac97_write(codec, AC97_EXTENDED_STATUS, ext_status&~0x3800); |
271 | 271 | ||
272 | ad1980_add_controls(codec); | 272 | ad1980_add_controls(codec); |
273 | ret = snd_soc_register_card(socdev); | 273 | ret = snd_soc_init_card(socdev); |
274 | if (ret < 0) { | 274 | if (ret < 0) { |
275 | printk(KERN_ERR "ad1980: failed to register card\n"); | 275 | printk(KERN_ERR "ad1980: failed to register card\n"); |
276 | goto reset_err; | 276 | goto reset_err; |