ASoC: remove duplicate definition of dapm_routes/num_dapm_routes

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>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 3e0070e..2bcb380 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -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 *);

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 3a3236d..b8f96a4 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -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);
@@ -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);