ASoC: soc-component: remove .debugfs_prefix from Component

All drivers are now setting .debugfs_prefix via Component driver.
Remove it from Component.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87cxy9k5vj.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 337b7ef4156c494c6ae9c6535f5c0bb5b59a6890..11bc9527653ff71061dae053b3f69245a2105501 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -248,7 +248,6 @@ struct snd_soc_component {
        void *mark_pm;
 
        struct dentry *debugfs_root;
-       const char *debugfs_prefix;
 };
 
 #define for_each_component_dais(component, dai)\

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index c0599031a3e4eb59109801c2d74dadaf8147bf4e..e8986c039aa543038b3fe88d41edc0afc42bdbe0 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -136,11 +136,11 @@ static void soc_init_component_debugfs(struct snd_soc_component *component)
        if (!component->card->debugfs_card_root)
                return;
 
-       if (component->debugfs_prefix) {
+       if (component->driver->debugfs_prefix) {
                char *name;
 
                name = kasprintf(GFP_KERNEL, "%s:%s",
-                       component->debugfs_prefix, component->name);
+                       component->driver->debugfs_prefix, component->name);
                if (name) {
                        component->debugfs_root = debugfs_create_dir(name,
                                component->card->debugfs_card_root);
@@ -2842,11 +2842,6 @@ int snd_soc_component_initialize(struct snd_soc_component *component,
        component->dev          = dev;
        component->driver       = driver;
 
-#ifdef CONFIG_DEBUG_FS
-       if (!component->debugfs_prefix)
-               component->debugfs_prefix = driver->debugfs_prefix;
-#endif
-
        return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_component_initialize);