ASoC: topology: Use unload() op directly

[platform/kernel/linux-starfive.git] / include / sound / soc-topology.h

diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h
index 4afd667..f055c69 100644 (file)
--- a/include/sound/soc-topology.h
+++ b/include/sound/soc-topology.h
@@ -62,7 +62,7 @@ struct snd_soc_dobj {
        enum snd_soc_dobj_type type;
        unsigned int index;     /* objects can belong in different groups */
        struct list_head list;
-       struct snd_soc_tplg_ops *ops;
+       int (*unload)(struct snd_soc_component *comp, struct snd_soc_dobj *dobj);
        union {
                struct snd_soc_dobj_control control;
                struct snd_soc_dobj_widget widget;
@@ -151,7 +151,7 @@ struct snd_soc_tplg_ops {
                struct snd_soc_tplg_hdr *);
 
        /* completion - called at completion of firmware loading */
-       void (*complete)(struct snd_soc_component *);
+       int (*complete)(struct snd_soc_component *comp);
 
        /* manifest - optional to inform component of manifest */
        int (*manifest)(struct snd_soc_component *, int index,
@@ -188,8 +188,7 @@ int snd_soc_tplg_widget_bind_event(struct snd_soc_dapm_widget *w,
 
 #else
 
-static inline int snd_soc_tplg_component_remove(struct snd_soc_component *comp,
-                                               u32 index)
+static inline int snd_soc_tplg_component_remove(struct snd_soc_component *comp)
 {
        return 0;
 }