Unverified Commit fc35880d authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Mark Brown
Browse files

ASoC: meson: aiu: fix duplicate debugfs directory error 



On a S905W-based system I get the following error:
debugfs: Directory 'c1105400.audio-controller' with parent 'P230-Q200' already present!

Turned out that multiple components having the same name triggers this
error in soc_init_component_debugfs(). With the patch the error is gone
and that's the debugfs entries.

/sys/kernel/debug/asoc/P230-Q200/acodec:c1105400.audio-controller
/sys/kernel/debug/asoc/P230-Q200/hdmi:c1105400.audio-controller
/sys/kernel/debug/asoc/P230-Q200/cpu:c1105400.audio-controller

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/38053baf-c33b-7fdf-7593-99b22153a9c0@gmail.com


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

sound/soc/meson/aiu-acodec-ctrl.c

+3 −0
Original line number Diff line number Diff line
@@ -193,6 +193,9 @@ static const struct snd_soc_component_driver aiu_acodec_ctrl_component = { 
	.of_xlate_dai_name	= aiu_acodec_of_xlate_dai_name,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

#ifdef CONFIG_DEBUG_FS

	.debugfs_prefix		= "acodec",

#endif

};



int aiu_acodec_ctrl_register_component(struct device *dev)

sound/soc/meson/aiu-codec-ctrl.c

+3 −0
Original line number Diff line number Diff line
@@ -140,6 +140,9 @@ static const struct snd_soc_component_driver aiu_hdmi_ctrl_component = { 
	.of_xlate_dai_name	= aiu_hdmi_of_xlate_dai_name,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

#ifdef CONFIG_DEBUG_FS

	.debugfs_prefix		= "hdmi",

#endif

};



int aiu_hdmi_ctrl_register_component(struct device *dev)

sound/soc/meson/aiu.c

+3 −0
Original line number Diff line number Diff line
@@ -103,6 +103,9 @@ static const struct snd_soc_component_driver aiu_cpu_component = { 
	.pointer		= aiu_fifo_pointer,

	.probe			= aiu_cpu_component_probe,

	.remove			= aiu_cpu_component_remove,

#ifdef CONFIG_DEBUG_FS

	.debugfs_prefix		= "cpu",

#endif

};



static struct snd_soc_dai_driver aiu_cpu_dai_drv[] = {