ASoC: Work around allmodconfig failure
PATCH 1/1 ASoC: Work around allmodconfig failure
Signed-off-by Mark Brown <[email protected]>
--- include/sound/soc.h | 3 +++ sound/soc/soc-core.c | 4 ++++ sound/soc/soc-utils.c | 6 ++---- 3 files changed, 9 insertions(+), 4 deletions(-)
include/sound/soc.h +3 -0
@@ -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
sound/soc/soc-core.c +4 -0
@@ -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
sound/soc/soc-utils.c +2 -4
@@ -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);
Signature · 1 line
1.7.4.1
Quoted 7 lines · Mark Brown
Signed-off-by Mark Brown <[email protected]>--- include/sound/soc.h | 3 +++ sound/soc/soc-core.c | 4 ++++ sound/soc/soc-utils.c | 6 ++---- 3 files changed, 9 insertions(+), 4 deletions(-)
Acked-by Liam Girdwood <[email protected]>