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>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 6ac6481b48828890875ea6fb03ff2e04b16abb2f..85ad971e9432522c419814e1b83b5fabd65fcb2d 100644 (file)
--- 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;
@@ -1079,6 +1077,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;
 

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6b0042835233e5dec7c28b5c3e7d952c43fafb27..25b26caea4e04dd554de546c691e637a4e8cfb6e 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -701,9 +701,18 @@ int snd_soc_resume(struct device *dev)
        return 0;
 }
 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
 #define snd_soc_suspend NULL
 #define snd_soc_resume NULL
+static inline void soc_resume_init(struct snd_soc_card *card)
+{
+}
 #endif
 
 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);
 
-#ifdef CONFIG_PM_SLEEP
-       /* deferred resume work */
-       INIT_WORK(&card->deferred_resume_work, soc_resume_deferred);
-#endif
+       soc_resume_init(card);
 
        ret = snd_soc_dapm_new_controls(&card->dapm, card->dapm_widgets,
                                        card->num_dapm_widgets);