aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2017-07-03 04:24:47 -0400
committerMark Brown <broonie@kernel.org>2017-07-03 11:50:49 -0400
commit7d3d6e0645dd3689e625161b9e312108e66b2b51 (patch)
treec296b0f6fb5439bd684e410b1b95602f6b97fd96
parent58be77537aa12ca0c6c91eaf37902ad5f8c812bd (diff)
ASoC: Intel: Skylake: Remove driver debugfs exit
For driver debugfs, debugfs_remove_recursive() is called which is not needed as it is already done in ASoC core debugfs. And a device managed memory need not be freed explicitly as device core frees it up. So remove unnecessary skl_debugfs_exit(). Fixes: 5cdf6c09ca9d ASoC: ("Intel: Skylake: Add debugfs support") Reported-by: Julia Lawall <julia.lawall@lip6.fr> Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/intel/skylake/skl-debug.c8
-rw-r--r--sound/soc/intel/skylake/skl.c1
-rw-r--r--sound/soc/intel/skylake/skl.h3
3 files changed, 0 insertions, 12 deletions
diff --git a/sound/soc/intel/skylake/skl-debug.c b/sound/soc/intel/skylake/skl-debug.c
index 34d06abbf796..dc20d91f62e6 100644
--- a/sound/soc/intel/skylake/skl-debug.c
+++ b/sound/soc/intel/skylake/skl-debug.c
@@ -259,11 +259,3 @@ err:
259 debugfs_remove_recursive(d->fs); 259 debugfs_remove_recursive(d->fs);
260 return NULL; 260 return NULL;
261} 261}
262
263void skl_debugfs_exit(struct skl_debug *d)
264{
265 debugfs_remove_recursive(d->fs);
266
267 kfree(d);
268
269}
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 410ce83f4a49..334917ee41cf 100644
--- 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)
866 /* codec removal, invoke bus_device_remove */ 866 /* codec removal, invoke bus_device_remove */
867 snd_hdac_ext_bus_device_remove(ebus); 867 snd_hdac_ext_bus_device_remove(ebus);
868 868
869 skl_debugfs_exit(skl->debugfs);
870 skl->debugfs = NULL; 869 skl->debugfs = NULL;
871 skl_platform_unregister(&pci->dev); 870 skl_platform_unregister(&pci->dev);
872 skl_free_dsp(skl); 871 skl_free_dsp(skl);
diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h
index 14e7778d7f80..a6b134b4c037 100644
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -125,7 +125,6 @@ struct skl_module_cfg;
125 125
126#ifdef CONFIG_DEBUG_FS 126#ifdef CONFIG_DEBUG_FS
127struct skl_debug *skl_debugfs_init(struct skl *skl); 127struct skl_debug *skl_debugfs_init(struct skl *skl);
128void skl_debugfs_exit(struct skl_debug *d);
129void skl_debug_init_module(struct skl_debug *d, 128void skl_debug_init_module(struct skl_debug *d,
130 struct snd_soc_dapm_widget *w, 129 struct snd_soc_dapm_widget *w,
131 struct skl_module_cfg *mconfig); 130 struct skl_module_cfg *mconfig);
@@ -134,8 +133,6 @@ static inline struct skl_debug *skl_debugfs_init(struct skl *skl)
134{ 133{
135 return NULL; 134 return NULL;
136} 135}
137static inline void skl_debugfs_exit(struct skl_debug *d)
138{}
139static inline void skl_debug_init_module(struct skl_debug *d, 136static inline void skl_debug_init_module(struct skl_debug *d,
140 struct snd_soc_dapm_widget *w, 137 struct snd_soc_dapm_widget *w,
141 struct skl_module_cfg *mconfig) 138 struct skl_module_cfg *mconfig)