diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-08-07 10:31:24 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-08-08 20:56:56 +0100 |
| commit | b3da42519c3e6ad977af844d61c31d0e5f874f1c (patch) | |
| tree | 2e3d2503ab2f1a7da2e621788950c0dea00f5562 /include/sound | |
| parent | b245d273cbcd64eeaa93305f99c4ea8a6baf9c89 (diff) | |
| download | linux-stable-b3da42519c3e6ad977af844d61c31d0e5f874f1c.tar.gz linux-stable-b3da42519c3e6ad977af844d61c31d0e5f874f1c.tar.bz2 linux-stable-b3da42519c3e6ad977af844d61c31d0e5f874f1c.zip | |
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>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 6ac6481b4882..85ad971e9432 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1058,8 +1058,6 @@ struct snd_soc_card { int num_of_dapm_routes; bool fully_routed; - struct work_struct deferred_resume_work; - /* lists of probed devices belonging to this card */ struct list_head component_dev_list; struct list_head list; @@ -1080,6 +1078,9 @@ struct snd_soc_card { #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_card_root; #endif +#ifdef CONFIG_PM_SLEEP + struct work_struct deferred_resume_work; +#endif u32 pop_time; void *drvdata; |