ASoC: Move DAPM widget debugfs entry creation to snd_soc_dapm_new_widgets

Currently debugfs entries for a DAPM widgets are only added in
snd_soc_dapm_debugfs_init. If a widget is added later (for example in the
dai_link's probe callback) it will not show up in debugfs.
This patch moves the creation of the widget debugfs entry to
snd_soc_dapm_new_widgets where it will be added after the widget has been
properly instantiated.

As a side-effect this will also reduce the number of times the DAPM widget list
is iterated during a card's instantiation.

Since it is possible that snd_soc_dapm_new_widgets is invoked form the codecs or
cards probe callbacks, the creation of the debugfs dapm directory has to be
moved before these are called.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 983ec640d4d7e7c4241254551ce5db9b0eed16e4..fbd011ebe19fff07566b679f31ef8ead44a93c5b 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1493,6 +1493,8 @@ static int soc_probe_codec(struct snd_soc_card *card,
        if (!try_module_get(codec->dev->driver->owner))
                return -ENODEV;
 
+       soc_init_codec_debugfs(codec);
+
        if (driver->probe) {
                ret = driver->probe(codec);
                if (ret < 0) {
@@ -1513,8 +1515,6 @@ static int soc_probe_codec(struct snd_soc_card *card,
                snd_soc_dapm_add_routes(&codec->dapm, driver->dapm_routes,
                                        driver->num_dapm_routes);
 
-       soc_init_codec_debugfs(codec);
-
        /* mark codec as probed and add to card codec list */
        codec->probed = 1;
        list_add(&codec->card_list, &card->codec_dev_list);
@@ -1523,6 +1523,7 @@ static int soc_probe_codec(struct snd_soc_card *card,
        return 0;
 
 err_probe:
+       soc_cleanup_codec_debugfs(codec);
        module_put(codec->dev->driver->owner);
 
        return ret;
@@ -1873,6 +1874,10 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
        card->dapm.card = card;
        list_add(&card->dapm.list, &card->dapm_list);
 
+#ifdef CONFIG_DEBUG_FS
+       snd_soc_dapm_debugfs_init(&card->dapm, card->debugfs_card_root);
+#endif
+
 #ifdef CONFIG_PM_SLEEP
        /* deferred resume work */
        INIT_WORK(&card->deferred_resume_work, soc_resume_deferred);
@@ -1919,10 +1924,6 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
                snd_soc_dapm_add_routes(&card->dapm, card->dapm_routes,
                                        card->num_dapm_routes);
 
-#ifdef CONFIG_DEBUG_FS
-       snd_soc_dapm_debugfs_init(&card->dapm, card->debugfs_card_root);
-#endif
-
        snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname),
                 "%s",  card->name);
        snprintf(card->snd_card->longname, sizeof(card->snd_card->longname),

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index ffed456b2142b0fc7f3bbd8919fdda58ff6fee45..8454cc2967d69f260271443df79607cecb1edbea 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1257,7 +1257,6 @@ static const struct file_operations dapm_bias_fops = {
 void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,
        struct dentry *parent)
 {
-       struct snd_soc_dapm_widget *w;
        struct dentry *d;
 
        dapm->debugfs_dapm = debugfs_create_dir("dapm", parent);
@@ -1274,25 +1273,35 @@ void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,
        if (!d)
                dev_warn(dapm->dev,
                         "ASoC: Failed to create bias level debugfs file\n");
+}
 
-       list_for_each_entry(w, &dapm->card->widgets, list) {
-               if (!w->name || w->dapm != dapm)
-                       continue;
+static void dapm_debugfs_add_widget(struct snd_soc_dapm_widget *w)
+{
+       struct snd_soc_dapm_context *dapm = w->dapm;
+       struct dentry *d;
 
-               d = debugfs_create_file(w->name, 0444,
-                                       dapm->debugfs_dapm, w,
-                                       &dapm_widget_power_fops);
-               if (!d)
-                       dev_warn(w->dapm->dev,
-                               "ASoC: Failed to create %s debugfs file\n",
-                               w->name);
-       }
+       if (!dapm->debugfs_dapm || !w->name)
+               return;
+
+       d = debugfs_create_file(w->name, 0444,
+                               dapm->debugfs_dapm, w,
+                               &dapm_widget_power_fops);
+       if (!d)
+               dev_warn(w->dapm->dev,
+                       "ASoC: Failed to create %s debugfs file\n",
+                       w->name);
 }
+
 #else
 void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,
        struct dentry *parent)
 {
 }
+
+static inline void dapm_debugfs_add_widget(struct snd_soc_dapm_widget *w)
+{
+}
+
 #endif
 
 /* test and update the power status of a mux widget */
@@ -1765,6 +1774,8 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm)
                }
 
                w->new = 1;
+
+               dapm_debugfs_add_widget(w);
        }
 
        dapm_power_widgets(dapm, SND_SOC_DAPM_STREAM_NOP);