leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: Work around allmodconfig failure

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
This commit is contained in:
Mark Brown 2011-04-28 10:57:54 +01:00
parent 6be449e53d
commit fb257897bf
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sound/soc.h
View File

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

4
sound/soc/soc-core.c
View File

@ -3868,12 +3868,16 @@ static int __init snd_soc_init(void)
pr_warn("ASoC: Failed to create platform list debugfs file\n"); pr_warn("ASoC: Failed to create platform list debugfs file\n");
#endif #endif
snd_soc_util_init();
return platform_driver_register(&soc_driver); return platform_driver_register(&soc_driver);
} }
module_init(snd_soc_init); module_init(snd_soc_init);
static void __exit snd_soc_exit(void) static void __exit snd_soc_exit(void)
{ {
snd_soc_util_exit();
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
debugfs_remove_recursive(snd_soc_debugfs_root); debugfs_remove_recursive(snd_soc_debugfs_root);
#endif #endif

6
sound/soc/soc-utils.c
View File

@ -82,7 +82,7 @@ static struct platform_driver soc_dummy_driver = {
static struct platform_device *soc_dummy_dev; static struct platform_device *soc_dummy_dev;
static int __init snd_soc_util_init(void) int __init snd_soc_util_init(void)
{ {
int ret; int ret;
@ -102,11 +102,9 @@ static int __init snd_soc_util_init(void)
return ret; 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_device_unregister(soc_dummy_dev);
platform_driver_unregister(&soc_dummy_driver); platform_driver_unregister(&soc_dummy_driver);
} }
module_exit(snd_soc_util_exit);