Changeset 695 for GPL/trunk/alsa-kernel/include/sound/soc-topology.h

Timestamp:

Aug 21, 2021, 3:35:34 AM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/soc-topology.h (modified) (2 diffs)

GPL/trunk/alsa-kernel/include/sound/soc-topology.h

@@ -31 +31 @@
 struct snd_soc_dai;
 struct snd_soc_dapm_route;
-
-/* object scan be loaded and unloaded in groups with identfying indexes */
-#define SND_SOC_TPLG_INDEX_ALL  0       /* ID that matches all FW objects */
 
 /* dynamic object type */
@@ -182 +179 @@
 /* Dynamic Object loading and removal for component drivers */
 int snd_soc_tplg_component_load(struct snd_soc_component *comp,
-        struct snd_soc_tplg_ops *ops, const struct firmware *fw,
-        u32 index);
-int snd_soc_tplg_component_remove(struct snd_soc_component *comp, u32 index);
-
-/* Widget removal - widgets also removed wth component API */
-void snd_soc_tplg_widget_remove(struct snd_soc_dapm_widget *w);
-void snd_soc_tplg_widget_remove_all(struct snd_soc_dapm_context *dapm,
-        u32 index);
+        struct snd_soc_tplg_ops *ops, const struct firmware *fw);
+int snd_soc_tplg_component_remove(struct snd_soc_component *comp);
 
 /* Binds event handlers to dynamic widgets */