openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: soc-core: tidyup for card->deferred_resume_work 

card->deferred_resume_work is used if CONFIG_PM_SLEEP was defined.
but
	1) It is defined even though CONFIG_PM_SLEEP was not defined
	2) random ifdef code is difficult to read.
This patch tidyup these issues.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/877e7paho1.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-08-07 10:31:24 +09:00 committed by Mark Brown
parent b245d273cb
commit b3da42519c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/sound/soc.h
View File

@ -1058,8 +1058,6 @@ struct snd_soc_card {
int num_of_dapm_routes; int num_of_dapm_routes;
bool fully_routed; bool fully_routed;
struct work_struct deferred_resume_work;
/* lists of probed devices belonging to this card */ /* lists of probed devices belonging to this card */
struct list_head component_dev_list; struct list_head component_dev_list;
struct list_head list; struct list_head list;
@ -1079,6 +1077,9 @@ struct snd_soc_card {
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_card_root; struct dentry *debugfs_card_root;
#endif
#ifdef CONFIG_PM_SLEEP
struct work_struct deferred_resume_work;
#endif #endif
u32 pop_time; u32 pop_time;

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

@ -701,9 +701,18 @@ int snd_soc_resume(struct device *dev)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(snd_soc_resume); EXPORT_SYMBOL_GPL(snd_soc_resume);
static void soc_resume_init(struct snd_soc_card *card)
{
/* deferred resume work */
INIT_WORK(&card->deferred_resume_work, soc_resume_deferred);
}
#else #else
#define snd_soc_suspend NULL #define snd_soc_suspend NULL
#define snd_soc_resume NULL #define snd_soc_resume NULL
static inline void soc_resume_init(struct snd_soc_card *card)
{
}
#endif #endif
static const struct snd_soc_dai_ops null_dai_ops = { static const struct snd_soc_dai_ops null_dai_ops = {
@ -1984,10 +1993,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
soc_init_card_debugfs(card); soc_init_card_debugfs(card);
#ifdef CONFIG_PM_SLEEP soc_resume_init(card);
/* deferred resume work */
INIT_WORK(&card->deferred_resume_work, soc_resume_deferred);
#endif
ret = snd_soc_dapm_new_controls(&card->dapm, card->dapm_widgets, ret = snd_soc_dapm_new_controls(&card->dapm, card->dapm_widgets,
card->num_dapm_widgets); card->num_dapm_widgets);