Commit 2abfd4bd authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Mark Brown

ASoC: topology: Rename remove_ handlers

Those are the only functions missing soc_tplg_ prefix, add it for
consistency.
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20230127231111.937721-6-amadeuszx.slawinski@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 23e591dc
...@@ -354,7 +354,7 @@ static int soc_tplg_add_kcontrol(struct soc_tplg *tplg, ...@@ -354,7 +354,7 @@ static int soc_tplg_add_kcontrol(struct soc_tplg *tplg,
} }
/* remove a mixer kcontrol */ /* remove a mixer kcontrol */
static void remove_mixer(struct snd_soc_component *comp, static void soc_tplg_remove_mixer(struct snd_soc_component *comp,
struct snd_soc_dobj *dobj, int pass) struct snd_soc_dobj *dobj, int pass)
{ {
struct snd_card *card = comp->card->snd_card; struct snd_card *card = comp->card->snd_card;
...@@ -370,7 +370,7 @@ static void remove_mixer(struct snd_soc_component *comp, ...@@ -370,7 +370,7 @@ static void remove_mixer(struct snd_soc_component *comp,
} }
/* remove an enum kcontrol */ /* remove an enum kcontrol */
static void remove_enum(struct snd_soc_component *comp, static void soc_tplg_remove_enum(struct snd_soc_component *comp,
struct snd_soc_dobj *dobj, int pass) struct snd_soc_dobj *dobj, int pass)
{ {
struct snd_card *card = comp->card->snd_card; struct snd_card *card = comp->card->snd_card;
...@@ -386,7 +386,7 @@ static void remove_enum(struct snd_soc_component *comp, ...@@ -386,7 +386,7 @@ static void remove_enum(struct snd_soc_component *comp,
} }
/* remove a byte kcontrol */ /* remove a byte kcontrol */
static void remove_bytes(struct snd_soc_component *comp, static void soc_tplg_remove_bytes(struct snd_soc_component *comp,
struct snd_soc_dobj *dobj, int pass) struct snd_soc_dobj *dobj, int pass)
{ {
struct snd_card *card = comp->card->snd_card; struct snd_card *card = comp->card->snd_card;
...@@ -402,7 +402,7 @@ static void remove_bytes(struct snd_soc_component *comp, ...@@ -402,7 +402,7 @@ static void remove_bytes(struct snd_soc_component *comp,
} }
/* remove a route */ /* remove a route */
static void remove_route(struct snd_soc_component *comp, static void soc_tplg_remove_route(struct snd_soc_component *comp,
struct snd_soc_dobj *dobj, int pass) struct snd_soc_dobj *dobj, int pass)
{ {
if (pass != SOC_TPLG_PASS_GRAPH) if (pass != SOC_TPLG_PASS_GRAPH)
...@@ -415,7 +415,7 @@ static void remove_route(struct snd_soc_component *comp, ...@@ -415,7 +415,7 @@ static void remove_route(struct snd_soc_component *comp,
} }
/* remove a widget and it's kcontrols - routes must be removed first */ /* remove a widget and it's kcontrols - routes must be removed first */
static void remove_widget(struct snd_soc_component *comp, static void soc_tplg_remove_widget(struct snd_soc_component *comp,
struct snd_soc_dobj *dobj, int pass) struct snd_soc_dobj *dobj, int pass)
{ {
struct snd_card *card = comp->card->snd_card; struct snd_card *card = comp->card->snd_card;
...@@ -443,7 +443,7 @@ static void remove_widget(struct snd_soc_component *comp, ...@@ -443,7 +443,7 @@ static void remove_widget(struct snd_soc_component *comp,
} }
/* remove DAI configurations */ /* remove DAI configurations */
static void remove_dai(struct snd_soc_component *comp, static void soc_tplg_remove_dai(struct snd_soc_component *comp,
struct snd_soc_dobj *dobj, int pass) struct snd_soc_dobj *dobj, int pass)
{ {
struct snd_soc_dai_driver *dai_drv = struct snd_soc_dai_driver *dai_drv =
...@@ -464,7 +464,7 @@ static void remove_dai(struct snd_soc_component *comp, ...@@ -464,7 +464,7 @@ static void remove_dai(struct snd_soc_component *comp,
} }
/* remove link configurations */ /* remove link configurations */
static void remove_link(struct snd_soc_component *comp, static void soc_tplg_remove_link(struct snd_soc_component *comp,
struct snd_soc_dobj *dobj, int pass) struct snd_soc_dobj *dobj, int pass)
{ {
struct snd_soc_dai_link *link = struct snd_soc_dai_link *link =
...@@ -492,7 +492,7 @@ static void remove_backend_link(struct snd_soc_component *comp, ...@@ -492,7 +492,7 @@ static void remove_backend_link(struct snd_soc_component *comp,
dobj->ops->link_unload(comp, dobj); dobj->ops->link_unload(comp, dobj);
/* /*
* We don't free the link here as what remove_link() do since BE * We don't free the link here as what soc_tplg_remove_link() do since BE
* links are not allocated by topology. * links are not allocated by topology.
* We however need to reset the dobj type to its initial values * We however need to reset the dobj type to its initial values
*/ */
...@@ -1492,7 +1492,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, ...@@ -1492,7 +1492,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg,
return 0; return 0;
ready_err: ready_err:
remove_widget(widget->dapm->component, &widget->dobj, SOC_TPLG_PASS_WIDGET); soc_tplg_remove_widget(widget->dapm->component, &widget->dobj, SOC_TPLG_PASS_WIDGET);
snd_soc_dapm_free_widget(widget); snd_soc_dapm_free_widget(widget);
hdr_err: hdr_err:
kfree(template.sname); kfree(template.sname);
...@@ -2627,25 +2627,25 @@ int snd_soc_tplg_component_remove(struct snd_soc_component *comp) ...@@ -2627,25 +2627,25 @@ int snd_soc_tplg_component_remove(struct snd_soc_component *comp)
switch (dobj->type) { switch (dobj->type) {
case SND_SOC_DOBJ_MIXER: case SND_SOC_DOBJ_MIXER:
remove_mixer(comp, dobj, pass); soc_tplg_remove_mixer(comp, dobj, pass);
break; break;
case SND_SOC_DOBJ_ENUM: case SND_SOC_DOBJ_ENUM:
remove_enum(comp, dobj, pass); soc_tplg_remove_enum(comp, dobj, pass);
break; break;
case SND_SOC_DOBJ_BYTES: case SND_SOC_DOBJ_BYTES:
remove_bytes(comp, dobj, pass); soc_tplg_remove_bytes(comp, dobj, pass);
break; break;
case SND_SOC_DOBJ_GRAPH: case SND_SOC_DOBJ_GRAPH:
remove_route(comp, dobj, pass); soc_tplg_remove_route(comp, dobj, pass);
break; break;
case SND_SOC_DOBJ_WIDGET: case SND_SOC_DOBJ_WIDGET:
remove_widget(comp, dobj, pass); soc_tplg_remove_widget(comp, dobj, pass);
break; break;
case SND_SOC_DOBJ_PCM: case SND_SOC_DOBJ_PCM:
remove_dai(comp, dobj, pass); soc_tplg_remove_dai(comp, dobj, pass);
break; break;
case SND_SOC_DOBJ_DAI_LINK: case SND_SOC_DOBJ_DAI_LINK:
remove_link(comp, dobj, pass); soc_tplg_remove_link(comp, dobj, pass);
break; break;
case SND_SOC_DOBJ_BACKEND_LINK: case SND_SOC_DOBJ_BACKEND_LINK:
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment