ASoC: dapm: Remove DAI DAPM context

The DAI DAPM context was added in commit be09ad90 ("ASoC: core: Add platform DAI
widget mapping") and the only user was removed again in commit ae10e7e8f ("ASoC:
core: Only add platform DAI widgets once."). Now that we have a per component
DAPM context it is unlikely that we'll need the DAI DAPM context again.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 688f2ba8009fc0a713d716a0e1fc35b1ceb750f6..031be2ab75d03d366479e9b4b0eb039b5c77f802 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -257,7 +257,6 @@ struct snd_soc_dai {
 
        struct snd_soc_dapm_widget *playback_widget;
        struct snd_soc_dapm_widget *capture_widget;
-       struct snd_soc_dapm_context dapm;
 
        /* DAI DMA data */
        void *playback_dma_data;

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 5fe732fdfd591ea4b619f11a1194c87119b6e8f7..995a4b7f87eb473af99518d3749df0787ed9f496 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1048,11 +1048,8 @@ static void soc_remove_link_dais(struct snd_soc_card *card, int num, int order)
                                        cpu_dai->name, err);
                }
                cpu_dai->probed = 0;
-
-               if (!cpu_dai->codec) {
-                       snd_soc_dapm_free(&cpu_dai->dapm);
+               if (!cpu_dai->codec)
                        module_put(cpu_dai->dev->driver->owner);
-               }
        }
 }
 
@@ -1510,11 +1507,8 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
        if (!cpu_dai->probed &&
                        cpu_dai->driver->probe_order == order) {
                if (!cpu_dai->codec) {
-                       cpu_dai->dapm.card = card;
                        if (!try_module_get(cpu_dai->dev->driver->owner))
                                return -ENODEV;
-
-                       list_add(&cpu_dai->dapm.list, &card->dapm_list);
                }
 
                if (cpu_dai->driver->probe) {
@@ -3975,13 +3969,9 @@ static int snd_soc_register_dais(struct snd_soc_component *component,
                dai->component = component;
                dai->dev = dev;
                dai->driver = &dai_drv[i];
-               dai->dapm.dev = dev;
                if (!dai->driver->ops)
                        dai->driver->ops = &null_dai_ops;
 
-               if (!dai->codec)
-                       dai->dapm.idle_bias_off = 1;
-
                list_add(&dai->list, &component->dai_list);
 
                dev_dbg(dev, "ASoC: Registered DAI '%s'\n", dai->name);