Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/debugfs' and 'asoc...

[mirror_ubuntu-bionic-kernel.git] / sound / soc / soc-core.c

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 4d9fb44db4f5be9341bf55908c214870a0c91a5f..175c8227de2c85a6cf1e444b0c59b8575ae4987c 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -980,7 +980,7 @@ EXPORT_SYMBOL_GPL(snd_soc_find_dai);
  * @card: soc card
  * @id: DAI link ID to match
  * @name: DAI link name to match, optional
- * @stream name: DAI link stream name to match, optional
+ * @stream_name: DAI link stream name to match, optional
  *
  * This function will search all existing DAI links of the soc card to
  * find the link of the same ID. Since DAI links may not have their
@@ -4203,8 +4203,6 @@ static void __exit snd_soc_exit(void)
        snd_soc_util_exit();
        snd_soc_debugfs_exit();
 
-#ifdef CONFIG_DEBUG_FS
-#endif
        platform_driver_unregister(&soc_driver);
 }
 module_exit(snd_soc_exit);