ASoC: soc.h: dobj is used only when SND_SOC_TOPOLOGY

snd_soc_dobj is used only when SND_SOC_TOPOLOGY was selected.
Let's enable it under SND_SOC_TOPOLOGY.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87o8xq251d.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 4e38ee6..e0855dc 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -847,7 +847,9 @@ struct snd_soc_dai_link {
        unsigned int ignore:1;
 
        struct list_head list; /* DAI link list of the soc card */
+#ifdef CONFIG_SND_SOC_TOPOLOGY
        struct snd_soc_dobj dobj; /* For topology */
+#endif
 };
 #define for_each_link_codecs(link, i, codec)                           \
        for ((i) = 0;                                                   \
@@ -1169,7 +1171,9 @@ struct soc_mixer_control {
        unsigned int sign_bit;
        unsigned int invert:1;
        unsigned int autodisable:1;
+#ifdef CONFIG_SND_SOC_TOPOLOGY
        struct snd_soc_dobj dobj;
+#endif
 };
 
 struct soc_bytes {
@@ -1180,8 +1184,9 @@ struct soc_bytes {
 
 struct soc_bytes_ext {
        int max;
+#ifdef CONFIG_SND_SOC_TOPOLOGY
        struct snd_soc_dobj dobj;
-
+#endif
        /* used for TLV byte control */
        int (*get)(struct snd_kcontrol *kcontrol, unsigned int __user *bytes,
                        unsigned int size);
@@ -1205,7 +1210,9 @@ struct soc_enum {
        const char * const *texts;
        const unsigned int *values;
        unsigned int autodisable:1;
+#ifdef CONFIG_SND_SOC_TOPOLOGY
        struct snd_soc_dobj dobj;
+#endif
 };
 
 /* device driver data */