openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Mark Brown 2008-11-28 11:49:07 +00:00
parent 682d5874f3
commit 968a6025aa
27 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/soc.h
View File

@ -162,7 +162,7 @@ extern struct snd_ac97_bus_ops soc_ac97_ops;
/* pcm <-> DAI connect */
void snd_soc_free_pcms(struct snd_soc_device *socdev);
int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid);
int snd_soc_register_card(struct snd_soc_device *socdev);
int snd_soc_init_card(struct snd_soc_device *socdev);
/* set runtime hw params */
int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,

2
sound/soc/codecs/ac97.c
View File

@ -114,7 +114,7 @@ static int ac97_soc_probe(struct platform_device *pdev)
if (ret < 0)
goto bus_err;
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0)
goto bus_err;
return 0;

2
sound/soc/codecs/ad1980.c
View File

@ -270,7 +270,7 @@ static int ad1980_soc_probe(struct platform_device *pdev)
ac97_write(codec, AC97_EXTENDED_STATUS, ext_status&~0x3800);
ad1980_add_controls(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "ad1980: failed to register card\n");
goto reset_err;

2
sound/soc/codecs/ad73311.c
View File

@ -67,7 +67,7 @@ static int ad73311_soc_probe(struct platform_device *pdev)
goto pcm_err;
}
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "ad73311: failed to register card\n");
goto register_err;

2
sound/soc/codecs/ak4535.c
View File

@ -512,7 +512,7 @@ static int ak4535_init(struct snd_soc_device *socdev)
ak4535_add_controls(codec);
ak4535_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "ak4535: failed to register card\n");
goto card_err;

2
sound/soc/codecs/cs4270.c
View File

@ -723,7 +723,7 @@ static int cs4270_probe(struct platform_device *pdev)
printk(KERN_INFO "cs4270: I2C disabled, using stand-alone mode\n");
#endif
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "cs4270: failed to register card\n");
goto error_del_driver;

2
sound/soc/codecs/pcm3008.c
View File

@ -91,7 +91,7 @@ static int pcm3008_soc_probe(struct platform_device *pdev)
}
/* Register Card. */
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "pcm3008: failed to register card\n");
goto card_err;

2
sound/soc/codecs/ssm2602.c
View File

@ -624,7 +624,7 @@ static int ssm2602_init(struct snd_soc_device *socdev)
ssm2602_add_controls(codec);
ssm2602_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
pr_err("ssm2602: failed to register card\n");
goto card_err;

2
sound/soc/codecs/tlv320aic23.c
View File

@ -720,7 +720,7 @@ static int tlv320aic23_init(struct snd_soc_device *socdev)
tlv320aic23_add_controls(codec);
tlv320aic23_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "tlv320aic23: failed to register card\n");
goto card_err;

2
sound/soc/codecs/tlv320aic26.c
View File

@ -359,7 +359,7 @@ static int aic26_probe(struct platform_device *pdev)
/* CODEC is setup, we can register the card now */
dev_dbg(&pdev->dev, "Registering card\n");
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
dev_err(&pdev->dev, "aic26: failed to register card\n");
goto card_err;

2
sound/soc/codecs/tlv320aic3x.c
View File

@ -1187,7 +1187,7 @@ static int aic3x_init(struct snd_soc_device *socdev)
aic3x_add_controls(codec);
aic3x_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "aic3x: failed to register card\n");
goto card_err;

2
sound/soc/codecs/twl4030.c
View File

@ -764,7 +764,7 @@ static int twl4030_init(struct snd_soc_device *socdev)
twl4030_add_controls(codec);
twl4030_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "twl4030: failed to register card\n");
goto card_err;

2
sound/soc/codecs/uda134x.c
View File

@ -578,7 +578,7 @@ static int uda134x_soc_probe(struct platform_device *pdev)
goto pcm_err;
}
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "UDA134X: failed to register card\n");
goto card_err;

2
sound/soc/codecs/uda1380.c
View File

@ -677,7 +677,7 @@ static int uda1380_init(struct snd_soc_device *socdev, int dac_clk)
/* uda1380 init */
uda1380_add_controls(codec);
uda1380_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
pr_err("uda1380: failed to register card\n");
goto card_err;

2
sound/soc/codecs/wm8510.c
View File

@ -658,7 +658,7 @@ static int wm8510_init(struct snd_soc_device *socdev)
wm8510_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
wm8510_add_controls(codec);
wm8510_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "wm8510: failed to register card\n");
goto card_err;

2
sound/soc/codecs/wm8580.c
View File

@ -869,7 +869,7 @@ static int wm8580_init(struct snd_soc_device *socdev)
wm8580_add_controls(codec);
wm8580_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "wm8580: failed to register card\n");
goto card_err;

2
sound/soc/codecs/wm8728.c
View File

@ -332,7 +332,7 @@ static int wm8728_init(struct snd_soc_device *socdev)
wm8728_add_controls(codec);
wm8728_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "wm8728: failed to register card\n");
goto card_err;

2
sound/soc/codecs/wm8731.c
View File

@ -545,7 +545,7 @@ static int wm8731_init(struct snd_soc_device *socdev)
wm8731_add_controls(codec);
wm8731_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "wm8731: failed to register card\n");
goto card_err;

2
sound/soc/codecs/wm8750.c
View File

@ -818,7 +818,7 @@ static int wm8750_init(struct snd_soc_device *socdev)
wm8750_add_controls(codec);
wm8750_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "wm8750: failed to register card\n");
goto card_err;

2
sound/soc/codecs/wm8753.c
View File

@ -1605,7 +1605,7 @@ static int wm8753_init(struct snd_soc_device *socdev)
wm8753_add_controls(codec);
wm8753_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "wm8753: failed to register card\n");
goto card_err;

2
sound/soc/codecs/wm8900.c
View File

@ -1365,7 +1365,7 @@ static int wm8900_init(struct snd_soc_device *socdev)
wm8900_add_controls(codec);
wm8900_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
dev_err(&i2c_client->dev, "Failed to register card\n");
goto card_err;

2
sound/soc/codecs/wm8903.c
View File

@ -1648,7 +1648,7 @@ static int wm8903_init(struct snd_soc_device *socdev)
wm8903_add_controls(codec);
wm8903_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
dev_err(&i2c->dev, "wm8903: failed to register card\n");
goto card_err;

2
sound/soc/codecs/wm8971.c
View File

@ -747,7 +747,7 @@ static int wm8971_init(struct snd_soc_device *socdev)
wm8971_add_controls(codec);
wm8971_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "wm8971: failed to register card\n");
goto card_err;

2
sound/soc/codecs/wm8990.c
View File

@ -1462,7 +1462,7 @@ static int wm8990_init(struct snd_soc_device *socdev)
wm8990_add_controls(codec);
wm8990_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "wm8990: failed to register card\n");
goto card_err;

2
sound/soc/codecs/wm9712.c
View File

@ -700,7 +700,7 @@ static int wm9712_soc_probe(struct platform_device *pdev)
wm9712_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
wm9712_add_controls(codec);
wm9712_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0) {
printk(KERN_ERR "wm9712: failed to register card\n");
goto reset_err;

2
sound/soc/codecs/wm9713.c
View File

@ -1247,7 +1247,7 @@ static int wm9713_soc_probe(struct platform_device *pdev)
wm9713_add_controls(codec);
wm9713_add_widgets(codec);
ret = snd_soc_register_card(socdev);
ret = snd_soc_init_card(socdev);
if (ret < 0)
goto reset_err;
return 0;

6
sound/soc/soc-core.c
View File

@ -1233,7 +1233,7 @@ int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid)
EXPORT_SYMBOL_GPL(snd_soc_new_pcms);
/**
* snd_soc_register_card - register sound card
* snd_soc_init_card - register sound card
* @socdev: the SoC audio device
*
* Register a SoC sound card. Also registers an AC97 device if the
@ -1241,7 +1241,7 @@ EXPORT_SYMBOL_GPL(snd_soc_new_pcms);
*
* Returns 0 for success, else error.
*/
int snd_soc_register_card(struct snd_soc_device *socdev)
int snd_soc_init_card(struct snd_soc_device *socdev)
{
struct snd_soc_codec *codec = socdev->codec;
struct snd_soc_card *card = socdev->card;
@ -1298,7 +1298,7 @@ int snd_soc_register_card(struct snd_soc_device *socdev)
out:
return ret;
}
EXPORT_SYMBOL_GPL(snd_soc_register_card);
EXPORT_SYMBOL_GPL(snd_soc_init_card);
/**
* snd_soc_free_pcms - free sound card and pcms