Commit 688d0ebf authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: remove duplicate definition of dapm_widgets/num_dapm_widgets

snd_soc_component and snd_soc_component_driver both have
dapm_widgets/num_dapm_widgets, 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 b8972bf0
...@@ -862,8 +862,6 @@ struct snd_soc_component { ...@@ -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_soc_dapm_widget *dapm_widgets;
unsigned int num_dapm_widgets;
const struct snd_soc_dapm_route *dapm_routes; const struct snd_soc_dapm_route *dapm_routes;
unsigned int num_dapm_routes; unsigned int num_dapm_routes;
struct snd_soc_codec *codec; struct snd_soc_codec *codec;
......
...@@ -1451,9 +1451,10 @@ static int soc_probe_component(struct snd_soc_card *card, ...@@ -1451,9 +1451,10 @@ static int soc_probe_component(struct snd_soc_card *card,
soc_init_component_debugfs(component); soc_init_component_debugfs(component);
if (component->dapm_widgets) { if (component->driver->dapm_widgets) {
ret = snd_soc_dapm_new_controls(dapm, component->dapm_widgets, ret = snd_soc_dapm_new_controls(dapm,
component->num_dapm_widgets); component->driver->dapm_widgets,
component->driver->num_dapm_widgets);
if (ret != 0) { if (ret != 0) {
dev_err(component->dev, dev_err(component->dev,
...@@ -3185,8 +3186,6 @@ static int snd_soc_component_initialize(struct snd_soc_component *component, ...@@ -3185,8 +3186,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->dapm_widgets = driver->dapm_widgets;
component->num_dapm_widgets = driver->num_dapm_widgets;
component->dapm_routes = driver->dapm_routes; component->dapm_routes = driver->dapm_routes;
component->num_dapm_routes = driver->num_dapm_routes; component->num_dapm_routes = driver->num_dapm_routes;
......
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