Skip to content

Commit 805c019

Browse files
morimotobroonie
authored andcommitted
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: Kuninori Morimoto <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 1ac2365 commit 805c019

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

include/sound/soc-dapm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm, const char
700700
int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin);
701701
int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm, const char *pin);
702702
unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol);
703-
void dapm_mark_endpoints_dirty(struct snd_soc_card *card);
703+
void snd_soc_dapm_mark_endpoints_dirty(struct snd_soc_card *card);
704704

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

sound/soc/soc-core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ int snd_soc_suspend(struct device *dev)
681681
soc_dapm_suspend_resume(card, SND_SOC_DAPM_STREAM_SUSPEND);
682682

683683
/* Recheck all endpoints too, their state is affected by suspend */
684-
dapm_mark_endpoints_dirty(card);
684+
snd_soc_dapm_mark_endpoints_dirty(card);
685685
snd_soc_dapm_sync(&card->dapm);
686686

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

780780
/* Recheck all endpoints too, their state is affected by suspend */
781-
dapm_mark_endpoints_dirty(card);
781+
snd_soc_dapm_mark_endpoints_dirty(card);
782782
snd_soc_dapm_sync(&card->dapm);
783783

784784
/* 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)
22862286
}
22872287

22882288
card->instantiated = 1;
2289-
dapm_mark_endpoints_dirty(card);
2289+
snd_soc_dapm_mark_endpoints_dirty(card);
22902290
snd_soc_dapm_sync(&card->dapm);
22912291

22922292
/* deactivate pins to sleep state */

sound/soc/soc-dapm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ static void dapm_path_invalidate(struct snd_soc_dapm_path *p)
283283
dapm_widget_invalidate_output_paths(p->source);
284284
}
285285

286-
void dapm_mark_endpoints_dirty(struct snd_soc_card *card)
286+
void snd_soc_dapm_mark_endpoints_dirty(struct snd_soc_card *card)
287287
{
288288
struct snd_soc_dapm_widget *w;
289289

0 commit comments

Comments
 (0)