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>

1 files changed, 1 insertions, 11 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 5fe732fdfd59..995a4b7f87eb 100644
--- 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);