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

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

ASoC: dapm: Pass snd_soc_card directly to soc_dpcm_runtime_update() 



soc_dpcm_runtime_update() operates on a ASoC card as a whole. Currently it takes
a snd_soc_dapm_widget as its only parameter though. The widget is then used to
look up the card and is otherwise unused. This patch changes the function to
take a pointer to the card directly. This makes it possible to to call
soc_dpcm_runtime_update() for updates which are not related to one specific
widget.

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

include/sound/soc-dpcm.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -133,6 +133,6 @@ void snd_soc_dpcm_be_set_state(struct snd_soc_pcm_runtime *be, int stream, 
/* internal use only */

/* internal use only */

int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute);

int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute);

int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd);

int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd);

int soc_dpcm_runtime_update(struct snd_soc_dapm_widget *);

int soc_dpcm_runtime_update(struct snd_soc_card *);





#endif
 
#endif

sound/soc/soc-dapm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1986,7 +1986,7 @@ int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_widget *widget, 
	ret = soc_dapm_mux_update_power(widget, kcontrol, mux, e);

	ret = soc_dapm_mux_update_power(widget, kcontrol, mux, e);

	mutex_unlock(&card->dapm_mutex);

	mutex_unlock(&card->dapm_mutex);

	if (ret > 0)

	if (ret > 0)

		soc_dpcm_runtime_update(widget);

		soc_dpcm_runtime_update(card);

	return ret;

	return ret;

}

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_mux_update_power);

EXPORT_SYMBOL_GPL(snd_soc_dapm_mux_update_power);
@@ -2032,7 +2032,7 @@ int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_widget *widget, 
	ret = soc_dapm_mixer_update_power(widget, kcontrol, connect);

	ret = soc_dapm_mixer_update_power(widget, kcontrol, connect);

	mutex_unlock(&card->dapm_mutex);

	mutex_unlock(&card->dapm_mutex);

	if (ret > 0)

	if (ret > 0)

		soc_dpcm_runtime_update(widget);

		soc_dpcm_runtime_update(card);

	return ret;

	return ret;

}

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_mixer_update_power);

EXPORT_SYMBOL_GPL(snd_soc_dapm_mixer_update_power);

sound/soc/soc-pcm.c

+1 −9
Original line number Original line Diff line number Diff line
@@ -1832,18 +1832,10 @@ static int dpcm_run_old_update(struct snd_soc_pcm_runtime *fe, int stream) 
/* Called by DAPM mixer/mux changes to update audio routing between PCMs and

/* Called by DAPM mixer/mux changes to update audio routing between PCMs and

 * any DAI links.

 * any DAI links.

 */

 */

int soc_dpcm_runtime_update(struct snd_soc_dapm_widget *widget)

int soc_dpcm_runtime_update(struct snd_soc_card *card)

{

{

	struct snd_soc_card *card;

	int i, old, new, paths;

	int i, old, new, paths;





	if (widget->codec)

		card = widget->codec->card;

	else if (widget->platform)

		card = widget->platform->card;

	else

		return -EINVAL;



	mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_RUNTIME);

	mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_RUNTIME);

	for (i = 0; i < card->num_rtd; i++) {

	for (i = 0; i < card->num_rtd; i++) {

		struct snd_soc_dapm_widget_list *list;

		struct snd_soc_dapm_widget_list *list;