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:
parent
682d5874f3
commit
968a6025aa
|
@ -162,7 +162,7 @@ extern struct snd_ac97_bus_ops soc_ac97_ops;
|
||||||
/* pcm <-> DAI connect */
|
/* pcm <-> DAI connect */
|
||||||
void snd_soc_free_pcms(struct snd_soc_device *socdev);
|
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_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 */
|
/* set runtime hw params */
|
||||||
int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
|
int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
|
||||||
|
|
|
@ -114,7 +114,7 @@ static int ac97_soc_probe(struct platform_device *pdev)
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto bus_err;
|
goto bus_err;
|
||||||
|
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto bus_err;
|
goto bus_err;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -270,7 +270,7 @@ static int ad1980_soc_probe(struct platform_device *pdev)
|
||||||
ac97_write(codec, AC97_EXTENDED_STATUS, ext_status&~0x3800);
|
ac97_write(codec, AC97_EXTENDED_STATUS, ext_status&~0x3800);
|
||||||
|
|
||||||
ad1980_add_controls(codec);
|
ad1980_add_controls(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "ad1980: failed to register card\n");
|
printk(KERN_ERR "ad1980: failed to register card\n");
|
||||||
goto reset_err;
|
goto reset_err;
|
||||||
|
|
|
@ -67,7 +67,7 @@ static int ad73311_soc_probe(struct platform_device *pdev)
|
||||||
goto pcm_err;
|
goto pcm_err;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "ad73311: failed to register card\n");
|
printk(KERN_ERR "ad73311: failed to register card\n");
|
||||||
goto register_err;
|
goto register_err;
|
||||||
|
|
|
@ -512,7 +512,7 @@ static int ak4535_init(struct snd_soc_device *socdev)
|
||||||
|
|
||||||
ak4535_add_controls(codec);
|
ak4535_add_controls(codec);
|
||||||
ak4535_add_widgets(codec);
|
ak4535_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "ak4535: failed to register card\n");
|
printk(KERN_ERR "ak4535: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -723,7 +723,7 @@ static int cs4270_probe(struct platform_device *pdev)
|
||||||
printk(KERN_INFO "cs4270: I2C disabled, using stand-alone mode\n");
|
printk(KERN_INFO "cs4270: I2C disabled, using stand-alone mode\n");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "cs4270: failed to register card\n");
|
printk(KERN_ERR "cs4270: failed to register card\n");
|
||||||
goto error_del_driver;
|
goto error_del_driver;
|
||||||
|
|
|
@ -91,7 +91,7 @@ static int pcm3008_soc_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Register Card. */
|
/* Register Card. */
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "pcm3008: failed to register card\n");
|
printk(KERN_ERR "pcm3008: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -624,7 +624,7 @@ static int ssm2602_init(struct snd_soc_device *socdev)
|
||||||
|
|
||||||
ssm2602_add_controls(codec);
|
ssm2602_add_controls(codec);
|
||||||
ssm2602_add_widgets(codec);
|
ssm2602_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
pr_err("ssm2602: failed to register card\n");
|
pr_err("ssm2602: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -720,7 +720,7 @@ static int tlv320aic23_init(struct snd_soc_device *socdev)
|
||||||
|
|
||||||
tlv320aic23_add_controls(codec);
|
tlv320aic23_add_controls(codec);
|
||||||
tlv320aic23_add_widgets(codec);
|
tlv320aic23_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "tlv320aic23: failed to register card\n");
|
printk(KERN_ERR "tlv320aic23: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -359,7 +359,7 @@ static int aic26_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
/* CODEC is setup, we can register the card now */
|
/* CODEC is setup, we can register the card now */
|
||||||
dev_dbg(&pdev->dev, "Registering card\n");
|
dev_dbg(&pdev->dev, "Registering card\n");
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(&pdev->dev, "aic26: failed to register card\n");
|
dev_err(&pdev->dev, "aic26: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -1187,7 +1187,7 @@ static int aic3x_init(struct snd_soc_device *socdev)
|
||||||
|
|
||||||
aic3x_add_controls(codec);
|
aic3x_add_controls(codec);
|
||||||
aic3x_add_widgets(codec);
|
aic3x_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "aic3x: failed to register card\n");
|
printk(KERN_ERR "aic3x: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -764,7 +764,7 @@ static int twl4030_init(struct snd_soc_device *socdev)
|
||||||
twl4030_add_controls(codec);
|
twl4030_add_controls(codec);
|
||||||
twl4030_add_widgets(codec);
|
twl4030_add_widgets(codec);
|
||||||
|
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "twl4030: failed to register card\n");
|
printk(KERN_ERR "twl4030: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -578,7 +578,7 @@ static int uda134x_soc_probe(struct platform_device *pdev)
|
||||||
goto pcm_err;
|
goto pcm_err;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "UDA134X: failed to register card\n");
|
printk(KERN_ERR "UDA134X: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -677,7 +677,7 @@ static int uda1380_init(struct snd_soc_device *socdev, int dac_clk)
|
||||||
/* uda1380 init */
|
/* uda1380 init */
|
||||||
uda1380_add_controls(codec);
|
uda1380_add_controls(codec);
|
||||||
uda1380_add_widgets(codec);
|
uda1380_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
pr_err("uda1380: failed to register card\n");
|
pr_err("uda1380: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -658,7 +658,7 @@ static int wm8510_init(struct snd_soc_device *socdev)
|
||||||
wm8510_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
|
wm8510_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
|
||||||
wm8510_add_controls(codec);
|
wm8510_add_controls(codec);
|
||||||
wm8510_add_widgets(codec);
|
wm8510_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "wm8510: failed to register card\n");
|
printk(KERN_ERR "wm8510: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -869,7 +869,7 @@ static int wm8580_init(struct snd_soc_device *socdev)
|
||||||
wm8580_add_controls(codec);
|
wm8580_add_controls(codec);
|
||||||
wm8580_add_widgets(codec);
|
wm8580_add_widgets(codec);
|
||||||
|
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "wm8580: failed to register card\n");
|
printk(KERN_ERR "wm8580: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -332,7 +332,7 @@ static int wm8728_init(struct snd_soc_device *socdev)
|
||||||
|
|
||||||
wm8728_add_controls(codec);
|
wm8728_add_controls(codec);
|
||||||
wm8728_add_widgets(codec);
|
wm8728_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "wm8728: failed to register card\n");
|
printk(KERN_ERR "wm8728: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -545,7 +545,7 @@ static int wm8731_init(struct snd_soc_device *socdev)
|
||||||
|
|
||||||
wm8731_add_controls(codec);
|
wm8731_add_controls(codec);
|
||||||
wm8731_add_widgets(codec);
|
wm8731_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "wm8731: failed to register card\n");
|
printk(KERN_ERR "wm8731: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -818,7 +818,7 @@ static int wm8750_init(struct snd_soc_device *socdev)
|
||||||
|
|
||||||
wm8750_add_controls(codec);
|
wm8750_add_controls(codec);
|
||||||
wm8750_add_widgets(codec);
|
wm8750_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "wm8750: failed to register card\n");
|
printk(KERN_ERR "wm8750: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -1605,7 +1605,7 @@ static int wm8753_init(struct snd_soc_device *socdev)
|
||||||
|
|
||||||
wm8753_add_controls(codec);
|
wm8753_add_controls(codec);
|
||||||
wm8753_add_widgets(codec);
|
wm8753_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "wm8753: failed to register card\n");
|
printk(KERN_ERR "wm8753: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -1365,7 +1365,7 @@ static int wm8900_init(struct snd_soc_device *socdev)
|
||||||
wm8900_add_controls(codec);
|
wm8900_add_controls(codec);
|
||||||
wm8900_add_widgets(codec);
|
wm8900_add_widgets(codec);
|
||||||
|
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(&i2c_client->dev, "Failed to register card\n");
|
dev_err(&i2c_client->dev, "Failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -1648,7 +1648,7 @@ static int wm8903_init(struct snd_soc_device *socdev)
|
||||||
|
|
||||||
wm8903_add_controls(codec);
|
wm8903_add_controls(codec);
|
||||||
wm8903_add_widgets(codec);
|
wm8903_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(&i2c->dev, "wm8903: failed to register card\n");
|
dev_err(&i2c->dev, "wm8903: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -747,7 +747,7 @@ static int wm8971_init(struct snd_soc_device *socdev)
|
||||||
|
|
||||||
wm8971_add_controls(codec);
|
wm8971_add_controls(codec);
|
||||||
wm8971_add_widgets(codec);
|
wm8971_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "wm8971: failed to register card\n");
|
printk(KERN_ERR "wm8971: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -1462,7 +1462,7 @@ static int wm8990_init(struct snd_soc_device *socdev)
|
||||||
|
|
||||||
wm8990_add_controls(codec);
|
wm8990_add_controls(codec);
|
||||||
wm8990_add_widgets(codec);
|
wm8990_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "wm8990: failed to register card\n");
|
printk(KERN_ERR "wm8990: failed to register card\n");
|
||||||
goto card_err;
|
goto card_err;
|
||||||
|
|
|
@ -700,7 +700,7 @@ static int wm9712_soc_probe(struct platform_device *pdev)
|
||||||
wm9712_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
|
wm9712_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
|
||||||
wm9712_add_controls(codec);
|
wm9712_add_controls(codec);
|
||||||
wm9712_add_widgets(codec);
|
wm9712_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_ERR "wm9712: failed to register card\n");
|
printk(KERN_ERR "wm9712: failed to register card\n");
|
||||||
goto reset_err;
|
goto reset_err;
|
||||||
|
|
|
@ -1247,7 +1247,7 @@ static int wm9713_soc_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
wm9713_add_controls(codec);
|
wm9713_add_controls(codec);
|
||||||
wm9713_add_widgets(codec);
|
wm9713_add_widgets(codec);
|
||||||
ret = snd_soc_register_card(socdev);
|
ret = snd_soc_init_card(socdev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto reset_err;
|
goto reset_err;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -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);
|
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
|
* @socdev: the SoC audio device
|
||||||
*
|
*
|
||||||
* Register a SoC sound card. Also registers an AC97 device if the
|
* 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.
|
* 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_codec *codec = socdev->codec;
|
||||||
struct snd_soc_card *card = socdev->card;
|
struct snd_soc_card *card = socdev->card;
|
||||||
|
@ -1298,7 +1298,7 @@ int snd_soc_register_card(struct snd_soc_device *socdev)
|
||||||
out:
|
out:
|
||||||
return ret;
|
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
|
* snd_soc_free_pcms - free sound card and pcms
|
||||||
|
|
Loading…
Reference in New Issue