mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
ASoC: soc-component: move snd_soc_component_fixup_controls()
snd_soc_component_xxx_controls() are located between _probe() and _remove() in soc-component.c, and are located in scattered positions in soc-component.h. Fixup them. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Reviewed-by: Alvin Šipraga <alvin.sipraga@analog.com> Link: https://patch.msgid.link/87jynlyolt.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
ed2c53c841
commit
ee0daa7a31
|
|
@ -358,6 +358,7 @@ void snd_soc_component_init_regmap(struct snd_soc_component *component,
|
|||
void snd_soc_component_exit_regmap(struct snd_soc_component *component);
|
||||
#endif
|
||||
|
||||
int snd_soc_component_fixup_controls(struct snd_soc_component *component);
|
||||
int snd_soc_component_add_controls(struct snd_soc_component *component,
|
||||
const struct snd_kcontrol_new *controls, unsigned int num_controls);
|
||||
|
||||
|
|
@ -407,7 +408,6 @@ void snd_soc_component_suspend(struct snd_soc_component *component);
|
|||
void snd_soc_component_resume(struct snd_soc_component *component);
|
||||
int snd_soc_component_is_suspended(struct snd_soc_component *component);
|
||||
int snd_soc_component_probe(struct snd_soc_component *component);
|
||||
int snd_soc_component_fixup_controls(struct snd_soc_component *component);
|
||||
void snd_soc_component_remove(struct snd_soc_component *component);
|
||||
int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
|
||||
struct device_node *ep);
|
||||
|
|
|
|||
|
|
@ -321,6 +321,12 @@ int snd_soc_component_probe(struct snd_soc_component *component)
|
|||
return soc_component_ret(component, ret);
|
||||
}
|
||||
|
||||
void snd_soc_component_remove(struct snd_soc_component *component)
|
||||
{
|
||||
if (component->driver->remove)
|
||||
component->driver->remove(component);
|
||||
}
|
||||
|
||||
/**
|
||||
* snd_soc_component_add_controls - Add an array of controls to a component.
|
||||
*
|
||||
|
|
@ -351,12 +357,6 @@ int snd_soc_component_fixup_controls(struct snd_soc_component *component)
|
|||
return soc_component_ret(component, ret);
|
||||
}
|
||||
|
||||
void snd_soc_component_remove(struct snd_soc_component *component)
|
||||
{
|
||||
if (component->driver->remove)
|
||||
component->driver->remove(component);
|
||||
}
|
||||
|
||||
int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
|
||||
struct device_node *ep)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user