未验证 提交 5e2cd47a 编写于 作者: A Amadeusz Sławiński 提交者: Mark Brown

ASoC: topology: Rename SOC_TPLG_PASS_MIXER to _CONTROL

Name of SOC_TPLG_PASS_MIXER pass is bit confusing, suggesting that it
may only apply to mixers. As it is used for all control types, change
name to SOC_TPLG_PASS_CONTROL.
Signed-off-by: NAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: NRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: NCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20220401120200.4047867-5-amadeuszx.slawinski@linux.intel.comSigned-off-by: NMark Brown <broonie@kernel.org>
上级 4fad3cc6
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
*/ */
#define SOC_TPLG_PASS_MANIFEST 0 #define SOC_TPLG_PASS_MANIFEST 0
#define SOC_TPLG_PASS_VENDOR 1 #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_WIDGET 3
#define SOC_TPLG_PASS_PCM_DAI 4 #define SOC_TPLG_PASS_PCM_DAI 4
#define SOC_TPLG_PASS_GRAPH 5 #define SOC_TPLG_PASS_GRAPH 5
...@@ -360,7 +360,7 @@ static void remove_mixer(struct snd_soc_component *comp, ...@@ -360,7 +360,7 @@ static void remove_mixer(struct snd_soc_component *comp,
{ {
struct snd_card *card = comp->card->snd_card; struct snd_card *card = comp->card->snd_card;
if (pass != SOC_TPLG_PASS_MIXER) if (pass != SOC_TPLG_PASS_CONTROL)
return; return;
if (dobj->ops && dobj->ops->control_unload) if (dobj->ops && dobj->ops->control_unload)
...@@ -376,7 +376,7 @@ static void remove_enum(struct snd_soc_component *comp, ...@@ -376,7 +376,7 @@ static void remove_enum(struct snd_soc_component *comp,
{ {
struct snd_card *card = comp->card->snd_card; struct snd_card *card = comp->card->snd_card;
if (pass != SOC_TPLG_PASS_MIXER) if (pass != SOC_TPLG_PASS_CONTROL)
return; return;
if (dobj->ops && dobj->ops->control_unload) if (dobj->ops && dobj->ops->control_unload)
...@@ -392,7 +392,7 @@ static void remove_bytes(struct snd_soc_component *comp, ...@@ -392,7 +392,7 @@ static void remove_bytes(struct snd_soc_component *comp,
{ {
struct snd_card *card = comp->card->snd_card; struct snd_card *card = comp->card->snd_card;
if (pass != SOC_TPLG_PASS_MIXER) if (pass != SOC_TPLG_PASS_CONTROL)
return; return;
if (dobj->ops && dobj->ops->control_unload) if (dobj->ops && dobj->ops->control_unload)
...@@ -2467,7 +2467,7 @@ static int soc_tplg_load_header(struct soc_tplg *tplg, ...@@ -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_MIXER:
case SND_SOC_TPLG_TYPE_ENUM: case SND_SOC_TPLG_TYPE_ENUM:
case SND_SOC_TPLG_TYPE_BYTES: 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; elem_load = soc_tplg_kcontrol_elems_load;
break; break;
case SND_SOC_TPLG_TYPE_DAPM_GRAPH: case SND_SOC_TPLG_TYPE_DAPM_GRAPH:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册