Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 968a6025 authored by Mark Brown's avatar Mark Brown
Browse files

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 682d5874

include/sound/soc.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

sound/soc/codecs/ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

sound/soc/codecs/ad1980.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

sound/soc/codecs/ad73311.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

sound/soc/codecs/ak4535.c

+1 −1
Original line number Diff line number Diff line
@@ -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;