Unverified Commit 7ca24386 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-core: merge snd_soc_register_dai() and soc_add_dai() 



We don't need to separete snd_soc_register_dai() and
soc_add_dai() anymore. Let's merge these

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87tv7hhkxm.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0d18a7ca

sound/soc/soc-core.c

+16 −27
Original line number Diff line number Diff line
@@ -2517,8 +2517,17 @@ static void soc_del_dai(struct snd_soc_dai *dai) 
	list_del(&dai->list);

}



/* Create a DAI and add it to the component's DAI list */

static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component,

/**

 * snd_soc_register_dai - Register a DAI dynamically & create its widgets

 *

 * @component: The component the DAIs are registered for

 * @dai_drv: DAI driver to use for the DAI

 *

 * Topology can use this API to register DAIs when probing a component.

 * These DAIs's widgets will be freed in the card cleanup and the DAIs

 * will be freed in the component cleanup.

 */

struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,

					 struct snd_soc_dai_driver *dai_drv,

					 bool legacy_dai_naming)

{
@@ -2527,6 +2536,8 @@ static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component, 


	dev_dbg(dev, "ASoC: dynamically register DAI %s\n", dev_name(dev));



	lockdep_assert_held(&client_mutex);



	dai = devm_kzalloc(dev, sizeof(*dai), GFP_KERNEL);

	if (dai == NULL)

		return NULL;
@@ -2565,6 +2576,7 @@ static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component, 
	dev_dbg(dev, "ASoC: Registered DAI '%s'\n", dai->name);

	return dai;

}

EXPORT_SYMBOL_GPL(snd_soc_register_dai);



void snd_soc_unregister_dai(struct snd_soc_dai *dai)

{
@@ -2572,29 +2584,6 @@ void snd_soc_unregister_dai(struct snd_soc_dai *dai) 
}

EXPORT_SYMBOL_GPL(snd_soc_unregister_dai);



/**

 * snd_soc_register_dai - Register a DAI dynamically & create its widgets

 *

 * @component: The component the DAIs are registered for

 * @dai_drv: DAI driver to use for the DAI

 *

 * Topology can use this API to register DAIs when probing a component.

 * These DAIs's widgets will be freed in the card cleanup and the DAIs

 * will be freed in the component cleanup.

 */

struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,

					 struct snd_soc_dai_driver *dai_drv,

					 bool legacy_dai_naming)

{

	struct device *dev = component->dev;



	dev_dbg(dev, "ASoC: dai register %s\n", dai_drv->name);



	lockdep_assert_held(&client_mutex);

	return soc_add_dai(component, dai_drv, legacy_dai_naming);

}

EXPORT_SYMBOL_GPL(snd_soc_register_dai);



/**

 * snd_soc_unregister_dai - Unregister DAIs from the ASoC core

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE