Unverified Commit d8ca7a0a authored Aug 07, 2019 by Kuninori Morimoto Committed by Mark Brown Aug 08, 2019

ASoC: soc-core: call snd_soc_dapm_debugfs_init() at soc_init_card_debugfs()



We have 2 soc_init_card_debugfs() implementations for with/without DEBUG_FS.
But, snd_soc_instantiate_card() calls snd_soc_dapm_debugfs_init() under
ifdef DEBUG_FS after soc_init_card_debugfs(). This is very strange.
We can call snd_soc_dapm_debugfs_init() under soc_init_card_debugfs().

	#ifdef CONFIG_DEBUG_FS
=>	static void soc_init_card_debugfs(...)
	{
		...
	}
	...
	#else
=>	static inline void soc_init_card_debugfs(...)
	{
		...
	}
	#endif

	static int snd_soc_instantiate_card(struct snd_soc_card *card)
	{
		...
=>		soc_init_card_debugfs(card);

*	#ifdef CONFIG_DEBUG_FS
*		snd_soc_dapm_debugfs_init(&card->dapm, card->debugfs_card_root);
*	#endif
	}

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87a7clahob.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 9b98c7c2

sound/soc/soc-core.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -216,6 +216,8 @@ static void soc_init_card_debugfs(struct snd_soc_card *card)

		debugfs_create_u32("dapm_pop_time", 0644, card->debugfs_card_root,
		&card->pop_time);

		snd_soc_dapm_debugfs_init(&card->dapm, card->debugfs_card_root);
		}

		static void soc_cleanup_card_debugfs(struct snd_soc_card *card)
		@@ -1982,10 +1984,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)

		soc_init_card_debugfs(card);

		#ifdef CONFIG_DEBUG_FS
		snd_soc_dapm_debugfs_init(&card->dapm, card->debugfs_card_root);
		#endif

		#ifdef CONFIG_PM_SLEEP
		/* deferred resume work */
		INIT_WORK(&card->deferred_resume_work, soc_resume_deferred);

Admin message