summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2026-05-28 03:48:01 +0300
committerMark Brown <broonie@kernel.org>2026-05-28 14:18:29 +0300
commitec4489c43efe434a132f27ff9298345de1cfacd8 (patch)
tree4f5644a0d53ee3bd9c34a19b79969050b2986406 /include
parent05b9c152045ed90a1f88dac6bbb05ea0db30aef3 (diff)
downloadlinux-ec4489c43efe434a132f27ff9298345de1cfacd8.tar.xz
ASoC: soc-card: add snd_soc_card_set_topology_name()
Some drivers want to use topology name, but currently each drivers are setting it by own method. This patch adds new snd_soc_card_set_topology_name() and do it by same method. Almost all driver doesn't set topology name, let's remove fixed name array, and use devm_kasprintf() instead. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Link: https://patch.msgid.link/878q942wce.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc-card.h2
-rw-r--r--include/sound/soc.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/include/sound/soc-card.h b/include/sound/soc-card.h
index ecc02e955279..1f1e7d45f553 100644
--- a/include/sound/soc-card.h
+++ b/include/sound/soc-card.h
@@ -47,6 +47,8 @@ int snd_soc_card_late_probe(struct snd_soc_card *card);
void snd_soc_card_fixup_controls(struct snd_soc_card *card);
int snd_soc_card_remove(struct snd_soc_card *card);
+void snd_soc_card_set_topology_name(struct snd_soc_card *card, const char *preifx);
+
int snd_soc_card_set_bias_level(struct snd_soc_card *card,
struct snd_soc_dapm_context *dapm,
enum snd_soc_bias_level level);
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 77a7539ef37f..ed8921835069 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -990,7 +990,7 @@ struct snd_soc_card {
bool pci_subsystem_set;
#endif /* CONFIG_PCI */
- char topology_shortname[32];
+ char *topology_shortname;
struct device *dev;
struct snd_card *snd_card;
@@ -1087,7 +1087,6 @@ struct snd_soc_card {
#endif
/* bit field */
unsigned int instantiated:1;
- unsigned int topology_shortname_created:1;
unsigned int fully_routed:1;
unsigned int probed:1;
unsigned int component_chaining:1;