From d34fe6f1d43675ee5cf199e2cfe5d7a197d85711 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Wed, 25 Jan 2023 14:18:13 +0100
Subject: [PATCH] up-down-mixer: convert to Zephyr native initialisation

Use SOF_MODULE_INIT() to register up-down-mixer with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/audio/up_down_mixer/up_down_mixer.c | 2 ++
 zephyr/wrapper.c                        | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/audio/up_down_mixer/up_down_mixer.c b/src/audio/up_down_mixer/up_down_mixer.c
index 5766d558c..e90e7729b 100644
--- a/src/audio/up_down_mixer/up_down_mixer.c
+++ b/src/audio/up_down_mixer/up_down_mixer.c
@@ -15,6 +15,7 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/cache.h>
+#include <rtos/init.h>
 #include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/lib/uuid.h>
@@ -463,3 +464,4 @@ static struct module_interface up_down_mixer_interface = {
 };
 
 DECLARE_MODULE_ADAPTER(up_down_mixer_interface, up_down_mixer_comp_uuid, up_down_mixer_comp_tr);
+SOF_MODULE_INIT(up_down_mixer, sys_comp_module_up_down_mixer_interface_init);
diff --git a/zephyr/wrapper.c b/zephyr/wrapper.c
index 1b897663d..884cf8721 100644
--- a/zephyr/wrapper.c
+++ b/zephyr/wrapper.c
@@ -182,7 +182,6 @@ static void sys_module_init(void)
  * constructors directly atm.
  */
 
-void sys_comp_module_up_down_mixer_interface_init(void);
 void sys_comp_tdfb_init(void);
 void sys_comp_ghd_init(void);
 void sys_comp_module_dts_interface_init(void);
@@ -228,9 +227,6 @@ int task_main_start(struct sof *sof)
 
 int start_complete(void)
 {
-	if (IS_ENABLED(CONFIG_COMP_UP_DOWN_MIXER))
-		sys_comp_module_up_down_mixer_interface_init();
-
 	if (IS_ENABLED(CONFIG_COMP_TDFB))
 		sys_comp_tdfb_init();