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

Commit 5acd7dfb authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: core: use snd_soc_register_dais() on codec 



snd_soc_register_dais() considers dai counts inside.
snd_soc_register_codec() does not need to care for it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f790b94d

sound/soc/soc-core.c

+5 −9
Original line number Diff line number Diff line
@@ -4086,11 +4086,10 @@ int snd_soc_register_codec(struct device *dev, 
	mutex_unlock(&client_mutex);



	/* register any DAIs */

	if (num_dai) {

	ret = snd_soc_register_dais(dev, dai_drv, num_dai);

		if (ret < 0)

			dev_err(codec->dev, "ASoC: Failed to regster"

				" DAIs: %d\n", ret);

	if (ret < 0) {

		dev_err(codec->dev, "ASoC: Failed to regster DAIs: %d\n", ret);

		goto fail_codec_name;

	}



	dev_dbg(codec->dev, "ASoC: Registered codec '%s'\n", codec->name);
@@ -4112,7 +4111,6 @@ EXPORT_SYMBOL_GPL(snd_soc_register_codec); 
void snd_soc_unregister_codec(struct device *dev)

{

	struct snd_soc_codec *codec;

	int i;



	list_for_each_entry(codec, &codec_list, list) {

		if (dev == codec->dev)
@@ -4121,9 +4119,7 @@ void snd_soc_unregister_codec(struct device *dev) 
	return;



found:

	if (codec->num_dai)

		for (i = 0; i < codec->num_dai; i++)

			snd_soc_unregister_dai(dev);

	snd_soc_unregister_dais(dev, codec->num_dai);



	mutex_lock(&client_mutex);

	list_del(&codec->list);