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

Commit 824ef826 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Pass card instead of dapm context to snd_soc_dapm_new_widgets() 



snd_soc_dapm_new_widgets() works on the ASoC card as a whole not on a specific
DAPM context. The DAPM context that is passed as the parameter is only used to
look up the pointer to the card. This patch updates the signature of
snd_soc_dapm_new_widgets() to take the card directly.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38f7d75e

include/sound/soc-dapm.h

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card, 
			 struct snd_soc_dapm_widget *sink);



/* dapm path setup */

int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_new_widgets(struct snd_soc_card *card);

void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm,

			    const struct snd_soc_dapm_route *route, int num);

sound/soc/soc-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1807,7 +1807,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) 
		list_for_each_entry(codec, &card->codec_dev_list, card_list)

			snd_soc_dapm_auto_nc_codec_pins(codec);



	snd_soc_dapm_new_widgets(&card->dapm);

	snd_soc_dapm_new_widgets(card);



	ret = snd_card_register(card->snd_card);

	if (ret < 0) {

sound/soc/soc-dapm.c

+1 −2
Original line number Diff line number Diff line
@@ -2712,9 +2712,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_weak_routes); 
 *

 * Returns 0 for success.

 */

int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm)

int snd_soc_dapm_new_widgets(struct snd_soc_card *card)

{

	struct snd_soc_card *card = dapm->card;

	struct snd_soc_dapm_widget *w;

	unsigned int val;