Unverified Commit 95c267dd authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-core: add snd_soc_dapm_init() 



It is easy to read code if it is cleanly using paired function/naming,
like start <-> stop, register <-> unregister, etc, etc.
But, current ALSA SoC code is very random, unbalance, not paired, etc.
It is easy to create bug at the such code, and it will be difficult to
debug.

soc-dapm has snd_soc_dapm_free() which cleanups debugfs, widgets, list.
But, there is no paired initialize function.
This patch adds snd_soc_dapm_init() and initilaizing dapm

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


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

include/sound/soc-dapm.h

+3 −0
Original line number Diff line number Diff line
@@ -416,6 +416,9 @@ int snd_soc_dapm_update_dai(struct snd_pcm_substream *substream, 
/* dapm path setup */

int snd_soc_dapm_new_widgets(struct snd_soc_card *card);

void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm);

void snd_soc_dapm_init(struct snd_soc_dapm_context *dapm,

		       struct snd_soc_card *card,

		       struct snd_soc_component *component);

int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm,

			    const struct snd_soc_dapm_route *route, int num);

int snd_soc_dapm_del_routes(struct snd_soc_dapm_context *dapm,

sound/soc/soc-core.c

+2 −12
Original line number Diff line number Diff line
@@ -1023,14 +1023,7 @@ static int soc_probe_component(struct snd_soc_card *card, 


	soc_init_component_debugfs(component);



	INIT_LIST_HEAD(&dapm->list);

	dapm->card		= card;

	dapm->dev		= component->dev;

	dapm->component		= component;

	dapm->bias_level	= SND_SOC_BIAS_OFF;

	dapm->idle_bias_off	= !component->driver->idle_bias_on;

	dapm->suspend_bias_off	= component->driver->suspend_bias_off;

	list_add(&dapm->list, &card->dapm_list);

	snd_soc_dapm_init(dapm, card, component);



	ret = snd_soc_dapm_new_controls(dapm,

					component->driver->dapm_widgets,
@@ -1937,10 +1930,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) 
	}

	mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_INIT);



	card->dapm.bias_level = SND_SOC_BIAS_OFF;

	card->dapm.dev = card->dev;

	card->dapm.card = card;

	list_add(&card->dapm.list, &card->dapm_list);

	snd_soc_dapm_init(&card->dapm, card, NULL);



	/* check whether any platform is ignore machine FE and using topology */

	soc_check_tplg_fes(card);

sound/soc/soc-dapm.c

+21 −0
Original line number Diff line number Diff line
@@ -4717,6 +4717,27 @@ void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm) 
}

EXPORT_SYMBOL_GPL(snd_soc_dapm_free);



void snd_soc_dapm_init(struct snd_soc_dapm_context *dapm,

		       struct snd_soc_card *card,

		       struct snd_soc_component *component)

{

	dapm->card		= card;

	dapm->component		= component;

	dapm->bias_level	= SND_SOC_BIAS_OFF;



	if (component) {

		dapm->dev		= component->dev;

		dapm->idle_bias_off	= !component->driver->idle_bias_on,

		dapm->suspend_bias_off	= component->driver->suspend_bias_off;

	} else {

		dapm->dev		= card->dev;

	}



	INIT_LIST_HEAD(&dapm->list);

	list_add(&dapm->list, &card->dapm_list);

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_init);



static void soc_dapm_shutdown_dapm(struct snd_soc_dapm_context *dapm)

{

	struct snd_soc_card *card = dapm->card;

CRA Git | Maintained and supported by SUSTech CRA and CCSE