Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8972bf0 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 21a03528

include/sound/soc.h

+0 −2
Original line number Diff line number Diff line
@@ -862,8 +862,6 @@ struct snd_soc_component { 
	/* Don't use these, use snd_soc_component_get_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;

	unsigned int num_dapm_widgets;

	const struct snd_soc_dapm_route *dapm_routes;

sound/soc/soc-core.c

+4 −5
Original line number Diff line number Diff line
@@ -1495,9 +1495,10 @@ static int soc_probe_component(struct snd_soc_card *card, 
		}

	}



	if (component->controls)

		snd_soc_add_component_controls(component, component->controls,

				     component->num_controls);

	if (component->driver->controls)

		snd_soc_add_component_controls(component,

					       component->driver->controls,

					       component->driver->num_controls);

	if (component->dapm_routes)

		snd_soc_dapm_add_routes(dapm, component->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)

		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->num_dapm_widgets = driver->num_dapm_widgets;

	component->dapm_routes = driver->dapm_routes;