ASoC: Work around allmodconfig failure

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index cb6b18b6eece54c811b9e53d26f09a6d4f5349c4..6ce3e573fb409e6be42828d4b968f92dac83085c 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -888,6 +888,9 @@ static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
        INIT_LIST_HEAD(&card->dapm_list);
 }
 
+int snd_soc_util_init(void);
+void snd_soc_util_exit(void);
+
 #include <sound/soc-dai.h>
 
 #ifdef CONFIG_DEBUG_FS

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 16be3e5cf9e755f2c0b86281d57b98df190bfd93..a823654ef36707faf223be14d383e1c08698866e 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3868,12 +3868,16 @@ static int __init snd_soc_init(void)
                pr_warn("ASoC: Failed to create platform list debugfs file\n");
 #endif
 
+       snd_soc_util_init();
+
        return platform_driver_register(&soc_driver);
 }
 module_init(snd_soc_init);
 
 static void __exit snd_soc_exit(void)
 {
+       snd_soc_util_exit();
+
 #ifdef CONFIG_DEBUG_FS
        debugfs_remove_recursive(snd_soc_debugfs_root);
 #endif

diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c
index 2865791408822c4776e5f995f4fb5c0f1dce2010..ec921ec99c2621eaa58b7d0c5e4eb97b861971de 100644 (file)
--- a/sound/soc/soc-utils.c
+++ b/sound/soc/soc-utils.c
@@ -82,7 +82,7 @@ static struct platform_driver soc_dummy_driver = {
 
 static struct platform_device *soc_dummy_dev;
 
-static int __init snd_soc_util_init(void)
+int __init snd_soc_util_init(void)
 {
        int ret;
 
@@ -102,11 +102,9 @@ static int __init snd_soc_util_init(void)
 
        return ret;
 }
-module_init(snd_soc_util_init);
 
-static void __exit snd_soc_util_exit(void)
+void __exit snd_soc_util_exit(void)
 {
        platform_device_unregister(soc_dummy_dev);
        platform_driver_unregister(&soc_dummy_driver);
 }
-module_exit(snd_soc_util_exit);