superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: qdsp6: audioreach: simplify module_list sz calculation 

Simplify module_list size calculation by doing inside modules loop.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20221027102710.21407-6-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
pull/520/merge
Srinivas Kandagatla 2022-10-27 11:27:06 +01:00 committed by Mark Brown
parent e4977b91cf
commit 4efb98e963
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/qcom/qdsp6/audioreach.c
View File

@ -430,7 +430,6 @@ void *audioreach_alloc_graph_pkt(struct q6apm *apm, struct audioreach_graph_info
struct audioreach_sub_graph *sgs;
struct apm_mod_list_obj *mlobj;
struct list_head *sg_list;
int num_modules_per_list;
int num_connections = 0;
int num_containers = 0;
int num_sub_graphs = 0;
@ -451,6 +450,9 @@ void *audioreach_alloc_graph_pkt(struct q6apm *apm, struct audioreach_graph_info
list_for_each_entry(container, &sgs->container_list, node) {
num_containers++;
num_modules += container->num_modules;
ml_sz = ml_sz + sizeof(struct apm_module_list_params) +
APM_MOD_LIST_OBJ_PSIZE(mlobj, container->num_modules);
list_for_each_entry(module, &container->modules_list, node) {
if (module->src_mod_inst_id)
num_connections++;
@ -459,11 +461,11 @@ void *audioreach_alloc_graph_pkt(struct q6apm *apm, struct audioreach_graph_info
}
num_modules_list = num_containers;
num_modules_per_list = num_modules/num_containers;
sg_sz = APM_SUB_GRAPH_PSIZE(sg_params, num_sub_graphs);
cont_sz = APM_CONTAINER_PSIZE(cont_params, num_containers);
ml_sz = ALIGN(sizeof(struct apm_module_list_params) +
num_modules_list * APM_MOD_LIST_OBJ_PSIZE(mlobj, num_modules_per_list), 8);
ml_sz = ALIGN(ml_sz, 8);
mp_sz = APM_MOD_PROP_PSIZE(mprop, num_modules);
mc_sz = APM_MOD_CONN_PSIZE(mcon, num_connections);