Unverified Commit b3da4251 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/877e7paho1.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b245d273

include/sound/soc.h

+3 −2
Original line number Diff line number Diff line
@@ -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;

sound/soc/soc-core.c

+10 −4
Original line number Diff line number Diff line
@@ -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);