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

ASoC: soc-dapm: add prefix on dapm_mark_endpoints_dirty() 



dapm_mark_endpoints_dirty() is global function. Let's add snd_soc_
prefix.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87ldp8hisj.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-dapm.h

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm, const char 
int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm, const char *pin);

unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol);

void dapm_mark_endpoints_dirty(struct snd_soc_card *card);

void snd_soc_dapm_mark_endpoints_dirty(struct snd_soc_card *card);



/*

 * Marks the specified pin as being not connected, disabling it along

sound/soc/soc-core.c

+3 −3
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ int snd_soc_suspend(struct device *dev) 
	soc_dapm_suspend_resume(card, SND_SOC_DAPM_STREAM_SUSPEND);



	/* Recheck all endpoints too, their state is affected by suspend */

	dapm_mark_endpoints_dirty(card);

	snd_soc_dapm_mark_endpoints_dirty(card);

	snd_soc_dapm_sync(&card->dapm);



	/* suspend all COMPONENTs */
@@ -778,7 +778,7 @@ static void soc_resume_deferred(struct work_struct *work) 
	dev_dbg(card->dev, "ASoC: resume work completed\n");



	/* Recheck all endpoints too, their state is affected by suspend */

	dapm_mark_endpoints_dirty(card);

	snd_soc_dapm_mark_endpoints_dirty(card);

	snd_soc_dapm_sync(&card->dapm);



	/* userspace can access us now we are back as we were before */
@@ -2286,7 +2286,7 @@ static int snd_soc_bind_card(struct snd_soc_card *card) 
	}



	card->instantiated = 1;

	dapm_mark_endpoints_dirty(card);

	snd_soc_dapm_mark_endpoints_dirty(card);

	snd_soc_dapm_sync(&card->dapm);



	/* deactivate pins to sleep state */

sound/soc/soc-dapm.c

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static void dapm_path_invalidate(struct snd_soc_dapm_path *p) 
		dapm_widget_invalidate_output_paths(p->source);

}



void dapm_mark_endpoints_dirty(struct snd_soc_card *card)

void snd_soc_dapm_mark_endpoints_dirty(struct snd_soc_card *card)

{

	struct snd_soc_dapm_widget *w;