Skip to content

Commit fc35880

Browse files
hkallweitbroonie
authored andcommitted
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: Heiner Kallweit <hkallweit1@gmail.com> Link: https://lore.kernel.org/r/38053baf-c33b-7fdf-7593-99b22153a9c0@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent d462f6e commit fc35880

3 files changed

Lines changed: 9 additions & 0 deletions

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,9 @@ static const struct snd_soc_component_driver aiu_acodec_ctrl_component = {
193193
.of_xlate_dai_name = aiu_acodec_of_xlate_dai_name,
194194
.endianness = 1,
195195
.non_legacy_dai_naming = 1,
196+
#ifdef CONFIG_DEBUG_FS
197+
.debugfs_prefix = "acodec",
198+
#endif
196199
};
197200

198201
int aiu_acodec_ctrl_register_component(struct device *dev)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ static const struct snd_soc_component_driver aiu_hdmi_ctrl_component = {
140140
.of_xlate_dai_name = aiu_hdmi_of_xlate_dai_name,
141141
.endianness = 1,
142142
.non_legacy_dai_naming = 1,
143+
#ifdef CONFIG_DEBUG_FS
144+
.debugfs_prefix = "hdmi",
145+
#endif
143146
};
144147

145148
int aiu_hdmi_ctrl_register_component(struct device *dev)

sound/soc/meson/aiu.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ static const struct snd_soc_component_driver aiu_cpu_component = {
103103
.pointer = aiu_fifo_pointer,
104104
.probe = aiu_cpu_component_probe,
105105
.remove = aiu_cpu_component_remove,
106+
#ifdef CONFIG_DEBUG_FS
107+
.debugfs_prefix = "cpu",
108+
#endif
106109
};
107110

108111
static struct snd_soc_dai_driver aiu_cpu_dai_drv[] = {

0 commit comments

Comments
 (0)