ASoC: soc-core: call snd_soc_dapm_debugfs_init() at soc_init_card_debugfs()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 7 Aug 2019 01:31:14 +0000 (10:31 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 8 Aug 2019 19:56:55 +0000 (20:56 +0100)
commitd8ca7a0a8583fc491b625450580c4092879af3dd
tree1195b3a5d18d3f11f70dc0c9380509fa95b70fe7
parent9b98c7c2a0599084c7ed629b5f88f474d2578307
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>
sound/soc/soc-core.c