ASoC: soc-core: define soc_dpcm_debugfs_add() for non CONFIG_DEBUG_FS (ee5b3f11) · Commits · 戴 / test

soc_dpcm_debugfs_add() is implemented at soc-pcm.c under CONFIG_DEBUG_FS. Thus, soc-core.c which is only user of it need to use CONFIG_DEBUG_FS, too. This patch defines soc_dpcm_debugfs_add() for non CONFIG_DEBUG_FS case. Then, we can remove #ifdef CONFIG_DEBUG_FS from soc-core.c Signed-off-by:

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

Mark Brown <broonie@kernel.org>

include/sound/soc-dpcm.h

+8 −1

Original line number	Diff line number	Diff line
		@@ -142,9 +142,16 @@ void snd_soc_dpcm_be_set_state(struct snd_soc_pcm_runtime *be, int stream,

		/* internal use only */
		int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute);
		void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd);
		int soc_dpcm_runtime_update(struct snd_soc_card *);

		#ifdef CONFIG_DEBUG_FS
		void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd);
		#else
		static inline void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd)
		{
		}
		#endif

		int dpcm_path_get(struct snd_soc_pcm_runtime *fe,
		int stream, struct snd_soc_dapm_widget_list **list_);
		int dpcm_process_paths(struct snd_soc_pcm_runtime *fe,

sound/soc/soc-core.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1487,11 +1487,9 @@ static int soc_probe_link_dais(struct snd_soc_card *card,
		if (ret)
		return ret;

		#ifdef CONFIG_DEBUG_FS
		/* add DPCM sysfs entries */
		if (dai_link->dynamic)
		soc_dpcm_debugfs_add(rtd);
		#endif

		num = rtd->num;

Admin message