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

ASoC: soc-core: have legacy_dai_naming at snd_soc_register_dai() 



ALSA SoC has 2 functions.
snd_soc_register_dai()  is used from topology
snd_soc_register_dais() is used from snd_soc_add_component()

In general, people think like _dai() is called from _dais()
with for loop. But in reality, these are very similar
but different implementation.
We shouldn't have duplicated and confusing implementation.

snd_soc_register_dai() is now used from topology.
But to reduce duplicated code, it should be used from _dais(), too.
To prepare it, this patch adds missing parameter legacy_dai_naming
to snd_soc_register_dai().

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87tv7i251u.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc.h

+2 −1
Original line number Diff line number Diff line
@@ -1327,7 +1327,8 @@ struct snd_soc_dai_link *snd_soc_find_dai_link(struct snd_soc_card *card, 
					       const char *stream_name);



int snd_soc_register_dai(struct snd_soc_component *component,

	struct snd_soc_dai_driver *dai_drv);

			 struct snd_soc_dai_driver *dai_drv,

			 bool legacy_dai_naming);

void snd_soc_unregister_dai(struct snd_soc_dai *dai);



struct snd_soc_dai *snd_soc_find_dai(

sound/soc/soc-core.c

+3 −2
Original line number Diff line number Diff line
@@ -2604,7 +2604,8 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_dai); 
 * will be freed in the component cleanup.

 */

int snd_soc_register_dai(struct snd_soc_component *component,

	struct snd_soc_dai_driver *dai_drv)

			 struct snd_soc_dai_driver *dai_drv,

			 bool legacy_dai_naming)

{

	struct snd_soc_dapm_context *dapm =

		snd_soc_component_get_dapm(component);
@@ -2618,7 +2619,7 @@ int snd_soc_register_dai(struct snd_soc_component *component, 
	}



	lockdep_assert_held(&client_mutex);

	dai = soc_add_dai(component, dai_drv, false);

	dai = soc_add_dai(component, dai_drv, legacy_dai_naming);

	if (!dai)

		return -ENOMEM;

sound/soc/soc-topology.c

+1 −1
Original line number Diff line number Diff line
@@ -1842,7 +1842,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg, 
	list_add(&dai_drv->dobj.list, &tplg->comp->dobj_list);



	/* register the DAI to the component */

	return snd_soc_register_dai(tplg->comp, dai_drv);

	return snd_soc_register_dai(tplg->comp, dai_drv, false);

}



static void set_link_flags(struct snd_soc_dai_link *link,

CRA Git | Maintained and supported by SUSTech CRA and CCSE