Skip to content

Commit

Permalink
ASoC: remove duplicate definition of dapm_routes/num_dapm_routes
Browse files Browse the repository at this point in the history
snd_soc_component and snd_soc_component_driver both have
dapm_routes/num_dapm_routes, 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>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Aug 25, 2017
1 parent 688d0eb commit 6969b2b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
2 changes: 0 additions & 2 deletions include/sound/soc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_soc_dapm_route *dapm_routes;
unsigned int num_dapm_routes;
struct snd_soc_codec *codec;

int (*probe)(struct snd_soc_component *);
Expand Down
10 changes: 4 additions & 6 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1500,9 +1500,10 @@ static int soc_probe_component(struct snd_soc_card *card,
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);
if (component->driver->dapm_routes)
snd_soc_dapm_add_routes(dapm,
component->driver->dapm_routes,
component->driver->num_dapm_routes);

list_add(&dapm->list, &card->dapm_list);
list_add(&component->card_list, &card->component_dev_list);
Expand Down Expand Up @@ -3186,9 +3187,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->dapm_routes = driver->dapm_routes;
component->num_dapm_routes = driver->num_dapm_routes;

INIT_LIST_HEAD(&component->dai_list);
mutex_init(&component->io_mutex);

Expand Down

0 comments on commit 6969b2b

Please sign in to comment.