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 <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87ldp8hisj.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 5aeb0822ce0bf61b6246c0e13dc1346ffb688285..ee77a80765c6cca98d8b5367771c88ec53e845ba 100644 (file)
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -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

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 67bebc339148b1c1b0573d6454e6e2953cd7ae46..b59f612de4e5acb2153f32149ec2bd48d59c8b3c 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -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 */

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 16f8eff42835aeb804fbc35712cd0931b186ed7e..d612dfbd245e15eb5e505730c30a236cb8b3db99 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -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;