ASoC: soc-dapm: move struct snd_soc_dapm_context

All drivers are now using new dapm functions.
Move struct snd_soc_dapm_context to soc-dapm.c

Suggested-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/87o6x69h4y.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87fr81qgvu.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 6f3e1b57cda32c85c3f52808daa1156a596cb2db..49f0fe05db01fefc71cac04467f89a39be6759f5 100644 (file)
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -20,6 +20,7 @@ struct regulator;
 struct soc_enum;
 struct snd_pcm_substream;
 struct snd_soc_pcm_runtime;
+struct snd_soc_dapm_context;
 
 /* widget has no PM register bit */
 #define SND_SOC_NOPM   -1
@@ -579,27 +580,6 @@ struct snd_soc_dapm_update {
        bool has_second_set;
 };
 
-/* DAPM context */
-struct snd_soc_dapm_context {
-       enum snd_soc_bias_level bias_level;
-
-       bool idle_bias;                         /* Use BIAS_OFF instead of STANDBY when false */
-
-       struct snd_soc_component *component;    /* parent component */
-       struct snd_soc_card *card;              /* parent card */
-
-       /* used during DAPM updates */
-       enum snd_soc_bias_level target_bias_level;
-       struct list_head list;
-
-       struct snd_soc_dapm_widget *wcache_sink;
-       struct snd_soc_dapm_widget *wcache_source;
-
-#ifdef CONFIG_DEBUG_FS
-       struct dentry *debugfs_dapm;
-#endif
-};
-
 /* A list of widgets associated with an object, typically a snd_kcontrol */
 struct snd_soc_dapm_widget_list {
        int num_widgets;

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 7aef57dcb2a72b149316336b062b543d9242a336..07370215ea7cc420268e2109a34999ad2d9be032 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -40,6 +40,27 @@
 
 #include <trace/events/asoc.h>
 
+/* DAPM context */
+struct snd_soc_dapm_context {
+       enum snd_soc_bias_level bias_level;
+
+       bool idle_bias;                         /* Use BIAS_OFF instead of STANDBY when false */
+
+       struct snd_soc_component *component;    /* parent component */
+       struct snd_soc_card *card;              /* parent card */
+
+       /* used during DAPM updates */
+       enum snd_soc_bias_level target_bias_level;
+       struct list_head list;
+
+       struct snd_soc_dapm_widget *wcache_sink;
+       struct snd_soc_dapm_widget *wcache_source;
+
+#ifdef CONFIG_DEBUG_FS
+       struct dentry *debugfs_dapm;
+#endif
+};
+
 #define DAPM_UPDATE_STAT(widget, val) widget->dapm->card->dapm_stats.val++;
 
 #define SND_SOC_DAPM_DIR_REVERSE(x) ((x == SND_SOC_DAPM_DIR_IN) ? \