mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-11 21:14:07 +08:00
ASoC: Work around allmodconfig failure
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
This commit is contained in:
parent
6be449e53d
commit
fb257897bf
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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);
|
|
||||||
|
Loading…
Reference in New Issue
Block a user