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

ASoC: soc-core: merge snd_soc_initialize_card_lists() 



snd_soc_initialize_card_lists() is doing card related
INIT_LIST_HEAD(), but, it is already doing at
snd_soc_register_card(). We don't need to do it separately.
This patch merges these.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/877e781ldq.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc.h

+0 −10
Original line number Diff line number Diff line
@@ -1220,16 +1220,6 @@ static inline void *snd_soc_card_get_drvdata(struct snd_soc_card *card) 
	return card->drvdata;

}



static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)

{

	INIT_LIST_HEAD(&card->widgets);

	INIT_LIST_HEAD(&card->paths);

	INIT_LIST_HEAD(&card->dapm_list);

	INIT_LIST_HEAD(&card->aux_comp_list);

	INIT_LIST_HEAD(&card->component_dev_list);

	INIT_LIST_HEAD(&card->list);

}



static inline bool snd_soc_volsw_is_stereo(struct soc_mixer_control *mc)

{

	if (mc->reg == mc->rreg && mc->shift == mc->rshift)

sound/soc/soc-core.c

+8 −5
Original line number Diff line number Diff line
@@ -2370,15 +2370,18 @@ int snd_soc_register_card(struct snd_soc_card *card) 


	dev_set_drvdata(card->dev, card);



	snd_soc_initialize_card_lists(card);



	INIT_LIST_HEAD(&card->widgets);

	INIT_LIST_HEAD(&card->paths);

	INIT_LIST_HEAD(&card->dapm_list);

	INIT_LIST_HEAD(&card->aux_comp_list);

	INIT_LIST_HEAD(&card->component_dev_list);

	INIT_LIST_HEAD(&card->list);

	INIT_LIST_HEAD(&card->dai_link_list);



	INIT_LIST_HEAD(&card->rtd_list);

	card->num_rtd = 0;



	INIT_LIST_HEAD(&card->dapm_dirty);

	INIT_LIST_HEAD(&card->dobj_list);



	card->num_rtd = 0;

	card->instantiated = 0;

	mutex_init(&card->mutex);

	mutex_init(&card->dapm_mutex);

CRA Git | Maintained and supported by SUSTech CRA and CCSE