ASoC: remove duplicate definition of controls/num_controls
snd_soc_component and snd_soc_component_driver both have controls/num_controls, but these are duplicated. Let's remove duplicated definition. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
21a035287e
commit
b8972bf052
|
@ -862,8 +862,6 @@ struct snd_soc_component {
|
||||||
/* Don't use these, use snd_soc_component_get_dapm() */
|
/* Don't use these, use snd_soc_component_get_dapm() */
|
||||||
struct snd_soc_dapm_context dapm;
|
struct snd_soc_dapm_context dapm;
|
||||||
|
|
||||||
const struct snd_kcontrol_new *controls;
|
|
||||||
unsigned int num_controls;
|
|
||||||
const struct snd_soc_dapm_widget *dapm_widgets;
|
const struct snd_soc_dapm_widget *dapm_widgets;
|
||||||
unsigned int num_dapm_widgets;
|
unsigned int num_dapm_widgets;
|
||||||
const struct snd_soc_dapm_route *dapm_routes;
|
const struct snd_soc_dapm_route *dapm_routes;
|
||||||
|
|
|
@ -1495,9 +1495,10 @@ static int soc_probe_component(struct snd_soc_card *card,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (component->controls)
|
if (component->driver->controls)
|
||||||
snd_soc_add_component_controls(component, component->controls,
|
snd_soc_add_component_controls(component,
|
||||||
component->num_controls);
|
component->driver->controls,
|
||||||
|
component->driver->num_controls);
|
||||||
if (component->dapm_routes)
|
if (component->dapm_routes)
|
||||||
snd_soc_dapm_add_routes(dapm, component->dapm_routes,
|
snd_soc_dapm_add_routes(dapm, component->dapm_routes,
|
||||||
component->num_dapm_routes);
|
component->num_dapm_routes);
|
||||||
|
@ -3184,8 +3185,6 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
|
||||||
if (driver->stream_event)
|
if (driver->stream_event)
|
||||||
dapm->stream_event = snd_soc_component_stream_event;
|
dapm->stream_event = snd_soc_component_stream_event;
|
||||||
|
|
||||||
component->controls = driver->controls;
|
|
||||||
component->num_controls = driver->num_controls;
|
|
||||||
component->dapm_widgets = driver->dapm_widgets;
|
component->dapm_widgets = driver->dapm_widgets;
|
||||||
component->num_dapm_widgets = driver->num_dapm_widgets;
|
component->num_dapm_widgets = driver->num_dapm_widgets;
|
||||||
component->dapm_routes = driver->dapm_routes;
|
component->dapm_routes = driver->dapm_routes;
|
||||||
|
|
Loading…
Reference in a new issue