Audio: IIR: Memory, blob, and fast_get allocs to module API

Allocate all memory, blob handlers, and fast_get() buffers through
module API mod_alloc() and friends and remove all redundant rfree(),
comp_data_blob_handler_free(), and fast_put() calls from module unload
functions and init error branches.

When resources are allocated through module API functions they
are automatically freed when the module is unloaded. This
simplifies error handling and unloading process.

Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>

Author: Jyri Sarha

src/audio/eq_iir/eq_iir.c

@@ -17,7 +17,6 @@
 #include <sof/common.h>
 #include <rtos/panic.h>
 #include <sof/ipc/msg.h>
-#include <rtos/alloc.h>
 #include <rtos/init.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
@@ -60,18 +59,17 @@ static int eq_iir_init(struct processing_module *mod)
 		return -EINVAL;
 	}
 
-	cd = rzalloc(SOF_MEM_FLAG_USER, sizeof(*cd));
+	cd = mod_zalloc(mod, sizeof(*cd));
 	if (!cd)
 		return -ENOMEM;
 
 	md->private = cd;
 
 	/* component model data handler */
-	cd->model_handler = comp_data_blob_handler_new(dev);
+	cd->model_handler = mod_data_blob_handler_new(mod);
 	if (!cd->model_handler) {
-		comp_err(dev, "comp_data_blob_handler_new() failed.");
-		ret = -ENOMEM;
-		goto err;
+		comp_err(dev, "mod_data_blob_handler_new() failed.");
+		return -ENOMEM;
 	}
 
 	/* Allocate and make a copy of the coefficients blob and reset IIR. If
@@ -80,27 +78,18 @@ static int eq_iir_init(struct processing_module *mod)
 	ret = comp_init_data_blob(cd->model_handler, bs, cfg->data);
 	if (ret < 0) {
 		comp_err(dev, "comp_init_data_blob() failed with error: %d", ret);
-		comp_data_blob_handler_free(cd->model_handler);
-		goto err;
+		return ret;
 	}
 
 	for (i = 0; i < PLATFORM_MAX_CHANNELS; i++)
 		iir_reset_df1(&cd->iir[i]);
 
 	return 0;
-err:
-	rfree(cd);
-	return ret;
 }
 
 static int eq_iir_free(struct processing_module *mod)
 {
-	struct comp_data *cd = module_get_private_data(mod);
-
-	eq_iir_free_delaylines(cd);
-	comp_data_blob_handler_free(cd->model_handler);
-
-	rfree(cd);
+	eq_iir_free_delaylines(mod);
 	return 0;
 }
 
@@ -144,7 +133,7 @@ static int eq_iir_process(struct processing_module *mod,
 	/* Check for changed configuration */
 	if (comp_is_new_data_blob_available(cd->model_handler)) {
 		cd->config = comp_get_data_blob(cd->model_handler, NULL, NULL);
-		ret = eq_iir_new_blob(mod, cd, audio_stream_get_frm_fmt(source),
+		ret = eq_iir_new_blob(mod, audio_stream_get_frm_fmt(source),
 				      audio_stream_get_frm_fmt(sink),
 				      audio_stream_get_channels(source));
 		if (ret)
@@ -216,7 +205,7 @@ static int eq_iir_prepare(struct processing_module *mod,
 
 	/* Initialize EQ */
 	if (cd->config) {
-		ret = eq_iir_new_blob(mod, cd, source_format, sink_format, channels);
+		ret = eq_iir_new_blob(mod, source_format, sink_format, channels);
 		if (ret)
 			return ret;
 	}
@@ -234,7 +223,7 @@ static int eq_iir_reset(struct processing_module *mod)
 	struct comp_data *cd = module_get_private_data(mod);
 	int i;
 
-	eq_iir_free_delaylines(cd);
+	eq_iir_free_delaylines(mod);
 
 	cd->eq_iir_func = NULL;
 	for (i = 0; i < PLATFORM_MAX_CHANNELS; i++)

src/audio/eq_iir/eq_iir.h

@@ -56,9 +56,8 @@ void eq_iir_s24_default(struct processing_module *mod, struct input_stream_buffe
 void eq_iir_s32_default(struct processing_module *mod, struct input_stream_buffer *bsource,
 			struct output_stream_buffer *bsink, uint32_t frames);
 
-int eq_iir_new_blob(struct processing_module *mod, struct comp_data *cd,
-		    enum sof_ipc_frame source_format, enum sof_ipc_frame sink_format,
-		    int channels);
+int eq_iir_new_blob(struct processing_module *mod, enum sof_ipc_frame source_format,
+		    enum sof_ipc_frame sink_format, int channels);
 
 void eq_iir_set_passthrough_func(struct comp_data *cd,
 				 enum sof_ipc_frame source_format,
@@ -71,5 +70,5 @@ void eq_iir_pass(struct processing_module *mod, struct input_stream_buffer *bsou
 
 int eq_iir_setup(struct processing_module *mod, int nch);
 
-void eq_iir_free_delaylines(struct comp_data *cd);
+void eq_iir_free_delaylines(struct processing_module *mod);
 #endif /* __SOF_AUDIO_EQ_IIR_EQ_IIR_H__ */

src/audio/eq_iir/eq_iir_generic.c

@@ -285,15 +285,16 @@ static void eq_iir_init_delay(struct iir_state_df1 *iir,
 	}
 }
 
-void eq_iir_free_delaylines(struct comp_data *cd)
+void eq_iir_free_delaylines(struct processing_module *mod)
 {
+	struct comp_data *cd = module_get_private_data(mod);
 	struct iir_state_df1 *iir = cd->iir;
 	int i = 0;
 
 	/* Free the common buffer for all EQs and point then
 	 * each IIR channel delay line to NULL.
 	 */
-	rfree(cd->iir_delay);
+	mod_free(mod, cd->iir_delay);
 	cd->iir_delay = NULL;
 	cd->iir_delay_size = 0;
 	for (i = 0; i < PLATFORM_MAX_CHANNELS; i++)
@@ -315,7 +316,7 @@ int eq_iir_setup(struct processing_module *mod, int nch)
 	int delay_size;
 
 	/* Free existing IIR channels data if it was allocated */
-	eq_iir_free_delaylines(cd);
+	eq_iir_free_delaylines(mod);
 
 	/* Set coefficients for each channel EQ from coefficient blob */
 	delay_size = eq_iir_init_coef(mod, nch);
@@ -329,8 +330,7 @@ int eq_iir_setup(struct processing_module *mod, int nch)
 		return 0;
 
 	/* Allocate all IIR channels data in a big chunk and clear it */
-	cd->iir_delay = rzalloc(SOF_MEM_FLAG_USER,
-				delay_size);
+	cd->iir_delay = mod_zalloc(mod, delay_size);
 	if (!cd->iir_delay) {
 		comp_err(mod->dev, "eq_iir_setup(), delay allocation fail");
 		return -ENOMEM;

src/audio/eq_iir/eq_iir_ipc3.c

@@ -17,7 +17,6 @@
 #include <sof/common.h>
 #include <rtos/panic.h>
 #include <sof/ipc/msg.h>
-#include <rtos/alloc.h>
 #include <rtos/init.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
@@ -298,10 +297,10 @@ static int eq_iir_verify_params(struct comp_dev *dev,
 	return 0;
 }
 
-int eq_iir_new_blob(struct processing_module *mod, struct comp_data *cd,
-		    enum sof_ipc_frame source_format, enum sof_ipc_frame sink_format,
-		    int channels)
+int eq_iir_new_blob(struct processing_module *mod, enum sof_ipc_frame source_format,
+		    enum sof_ipc_frame sink_format, int channels)
 {
+	struct comp_data *cd = module_get_private_data(mod);
 	int ret;
 
 	ret = eq_iir_setup(mod, channels);

src/audio/eq_iir/eq_iir_ipc4.c

@@ -17,7 +17,6 @@
 #include <sof/common.h>
 #include <rtos/panic.h>
 #include <sof/ipc/msg.h>
-#include <rtos/alloc.h>
 #include <rtos/init.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
@@ -77,10 +76,10 @@ static eq_iir_func eq_iir_find_func(struct processing_module *mod)
 	return NULL;
 }
 
-int eq_iir_new_blob(struct processing_module *mod, struct comp_data *cd,
-		    enum sof_ipc_frame source_format, enum sof_ipc_frame sink_format,
-		    int channels)
+int eq_iir_new_blob(struct processing_module *mod, enum sof_ipc_frame source_format,
+		    enum sof_ipc_frame sink_format, int channels)
 {
+	struct comp_data *cd = module_get_private_data(mod);
 	int ret;
 
 	ret = eq_iir_setup(mod, channels);