ASoC: topology: Rename SOC_TPLG_PASS_MIXER to _CONTROL

[sfrench/cifs-2.6.git] / sound / soc / soc-topology.c

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index f8e482d616fbd0d4d61508954a1206b8c17c7eca..4e7dabcd69a4e1609854be043fb1ca82f0f4fa28 100644 (file)
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -40,7 +40,7 @@
  */
 #define SOC_TPLG_PASS_MANIFEST         0
 #define SOC_TPLG_PASS_VENDOR           1
-#define SOC_TPLG_PASS_MIXER            2
+#define SOC_TPLG_PASS_CONTROL          2
 #define SOC_TPLG_PASS_WIDGET           3
 #define SOC_TPLG_PASS_PCM_DAI          4
 #define SOC_TPLG_PASS_GRAPH            5
@@ -360,7 +360,7 @@ static void remove_mixer(struct snd_soc_component *comp,
 {
        struct snd_card *card = comp->card->snd_card;
 
-       if (pass != SOC_TPLG_PASS_MIXER)
+       if (pass != SOC_TPLG_PASS_CONTROL)
                return;
 
        if (dobj->ops && dobj->ops->control_unload)
@@ -376,7 +376,7 @@ static void remove_enum(struct snd_soc_component *comp,
 {
        struct snd_card *card = comp->card->snd_card;
 
-       if (pass != SOC_TPLG_PASS_MIXER)
+       if (pass != SOC_TPLG_PASS_CONTROL)
                return;
 
        if (dobj->ops && dobj->ops->control_unload)
@@ -392,7 +392,7 @@ static void remove_bytes(struct snd_soc_component *comp,
 {
        struct snd_card *card = comp->card->snd_card;
 
-       if (pass != SOC_TPLG_PASS_MIXER)
+       if (pass != SOC_TPLG_PASS_CONTROL)
                return;
 
        if (dobj->ops && dobj->ops->control_unload)
@@ -2467,7 +2467,7 @@ static int soc_tplg_load_header(struct soc_tplg *tplg,
        case SND_SOC_TPLG_TYPE_MIXER:
        case SND_SOC_TPLG_TYPE_ENUM:
        case SND_SOC_TPLG_TYPE_BYTES:
-               hdr_pass = SOC_TPLG_PASS_MIXER;
+               hdr_pass = SOC_TPLG_PASS_CONTROL;
                elem_load = soc_tplg_kcontrol_elems_load;
                break;
        case SND_SOC_TPLG_TYPE_DAPM_GRAPH: