Merge remote-tracking branch 'asoc/topic/inte' into asoc-next

diff --git a/sound/soc/intel/skylake/skl-debug.c b/sound/soc/intel/skylake/skl-debug.c
index 75497b1fda454b4036361862418e3d83ca9ff69c..dc20d91f62e6c45302b0bc5a8ead3d36b9c6ad1a 100644 (file)
--- a/sound/soc/intel/skylake/skl-debug.c
+++ b/sound/soc/intel/skylake/skl-debug.c
@@ -20,6 +20,7 @@
 #include "skl-sst-ipc.h"
 #include "skl-tplg-interface.h"
 #include "skl-topology.h"
+#include "../common/sst-dsp.h"
 #include "../common/sst-dsp-priv.h"
 
 #define MOD_BUF                PAGE_SIZE
@@ -258,11 +259,3 @@ struct skl_debug *skl_debugfs_init(struct skl *skl)
        debugfs_remove_recursive(d->fs);
        return NULL;
 }
-
-void skl_debugfs_exit(struct skl_debug *d)
-{
-       debugfs_remove_recursive(d->fs);
-
-       kfree(d);
-
-}

diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 410ce83f4a49c711e4d76af19cc395cd206e3cb9..334917ee41cf8ede4aa443cc9eb8d7653e6471ac 100644 (file)
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -866,7 +866,6 @@ static void skl_remove(struct pci_dev *pci)
        /* codec removal, invoke bus_device_remove */
        snd_hdac_ext_bus_device_remove(ebus);
 
-       skl_debugfs_exit(skl->debugfs);
        skl->debugfs = NULL;
        skl_platform_unregister(&pci->dev);
        skl_free_dsp(skl);

diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h
index 14e7778d7f80c1f335b21a26c5d4496ad2c09783..a6b134b4c037d52bc5fc948b8064c9f2b7f577b3 100644 (file)
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -125,7 +125,6 @@ struct skl_module_cfg;
 
 #ifdef CONFIG_DEBUG_FS
 struct skl_debug *skl_debugfs_init(struct skl *skl);
-void skl_debugfs_exit(struct skl_debug *d);
 void skl_debug_init_module(struct skl_debug *d,
                        struct snd_soc_dapm_widget *w,
                        struct skl_module_cfg *mconfig);
@@ -134,8 +133,6 @@ static inline struct skl_debug *skl_debugfs_init(struct skl *skl)
 {
        return NULL;
 }
-static inline void skl_debugfs_exit(struct skl_debug *d)
-{}
 static inline void skl_debug_init_module(struct skl_debug *d,
                                         struct snd_soc_dapm_widget *w,
                                         struct skl_module_cfg *mconfig)