From ff25356f47ca31517c6c9a83acbbfe79aa624b67 Mon Sep 17 00:00:00 2001 From: Adrian Warecki Date: Thu, 29 Feb 2024 12:56:13 +0100 Subject: [PATCH] module_adapter: modules: Remove unused sys_service pointer The unused sys_service field has been removed from the processing_module structure. It was never initialized anywhere, and its value was passed as a parameter to the native_system_agent_start function which did not use it. Signed-off-by: Adrian Warecki --- src/audio/module_adapter/library/native_system_agent.c | 6 ++---- src/include/module/module/base.h | 3 --- .../sof/audio/module_adapter/library/native_system_agent.h | 3 +-- src/library_manager/lib_manager.c | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/audio/module_adapter/library/native_system_agent.c b/src/audio/module_adapter/library/native_system_agent.c index 58c24fadf31a..9704da50739e 100644 --- a/src/audio/module_adapter/library/native_system_agent.c +++ b/src/audio/module_adapter/library/native_system_agent.c @@ -19,10 +19,8 @@ typedef void* (*native_create_instance_f)(void *mod_cfg, void *parent_ppl, struct native_system_agent native_sys_agent; -void *native_system_agent_start(uint32_t *sys_service, - uint32_t entry_point, uint32_t module_id, - uint32_t instance_id, uint32_t core_id, uint32_t log_handle, - void *mod_cfg) +void *native_system_agent_start(uint32_t entry_point, uint32_t module_id, uint32_t instance_id, + uint32_t core_id, uint32_t log_handle, void *mod_cfg) { native_sys_agent.module_id = module_id; native_sys_agent.instance_id = instance_id; diff --git a/src/include/module/module/base.h b/src/include/module/module/base.h index a40e803e0ec5..16db091abd7d 100644 --- a/src/include/module/module/base.h +++ b/src/include/module/module/base.h @@ -180,9 +180,6 @@ struct processing_module { */ bool stream_copy_single_to_single; - /* pointer to system services for loadable modules */ - uint32_t *sys_service; - /* total processed data after stream started */ uint64_t total_data_consumed; uint64_t total_data_produced; diff --git a/src/include/sof/audio/module_adapter/library/native_system_agent.h b/src/include/sof/audio/module_adapter/library/native_system_agent.h index 58def6ec67b6..6563ef026975 100644 --- a/src/include/sof/audio/module_adapter/library/native_system_agent.h +++ b/src/include/sof/audio/module_adapter/library/native_system_agent.h @@ -20,8 +20,7 @@ struct native_system_agent { uint32_t module_size; }; -void *native_system_agent_start(uint32_t *sys_service, - uint32_t entry_point, uint32_t module_id, uint32_t instance_id, +void *native_system_agent_start(uint32_t entry_point, uint32_t module_id, uint32_t instance_id, uint32_t core_id, uint32_t log_handle, void *mod_cfg); #endif /* __NATIVE_SYSTEM_AGENT_H__ */ diff --git a/src/library_manager/lib_manager.c b/src/library_manager/lib_manager.c index 2c15e386f5bf..4c68ed498d37 100644 --- a/src/library_manager/lib_manager.c +++ b/src/library_manager/lib_manager.c @@ -544,7 +544,7 @@ static struct comp_dev *lib_manager_module_create(const struct comp_driver *drv, /* Intel modules expects DW size here */ mod_cfg.size = args->size >> 2; - ((struct comp_driver *)drv)->adapter_ops = native_system_agent_start(NULL, module_entry_point, + ((struct comp_driver *)drv)->adapter_ops = native_system_agent_start(module_entry_point, module_id, instance_id, 0, log_handle, &mod_cfg);