fix: explicit usage of a local var in macro

Explicit usage of a local variable in a macro is not a
good practice.
Macros changed to use a variable as an argument

+ fix a warning "'flags' may be used uninitialized"

Signed-off-by: Marcin Szkudlinski <[email protected]>

src/ipc/ipc4/helper.c

@@ -377,15 +377,15 @@ static struct comp_buffer *ipc4_create_buffer(struct comp_dev *src, bool is_shar
  * disable any interrupts.
  */
 
-#define ll_block(cross_core_bind) \
+#define ll_block(cross_core_bind, flags) \
 	do { \
 		if (cross_core_bind) \
 			domain_block(sof_get()->platform_timer_domain); \
 		else \
 			irq_local_disable(flags); \
 	} while (0)
 
-#define ll_unblock(cross_core_bind) \
+#define ll_unblock(cross_core_bind, flags) \
 	do { \
 		if (cross_core_bind) \
 			domain_unblock(sof_get()->platform_timer_domain); \
@@ -423,8 +423,8 @@ static int ll_wait_finished_on_core(struct comp_dev *dev)
 
 #else
 
-#define ll_block(cross_core_bind)	irq_local_disable(flags)
-#define ll_unblock(cross_core_bind)	irq_local_enable(flags)
+#define ll_block(cross_core_bind, flags)	irq_local_disable(flags)
+#define ll_unblock(cross_core_bind, flags)	irq_local_enable(flags)
 
 #endif
 
@@ -436,7 +436,7 @@ int ipc_comp_connect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
 	struct comp_dev *sink;
 	struct ipc4_base_module_cfg source_src_cfg;
 	struct ipc4_base_module_cfg sink_src_cfg;
-	uint32_t flags;
+	uint32_t flags = 0;
 	uint32_t ibs = 0;
 	uint32_t obs = 0;
 	uint32_t buf_size;
@@ -573,7 +573,7 @@ int ipc_comp_connect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
 	 * blocked on corresponding core(s) to prevent IPC or IDC task getting preempted which
 	 * could result in buffers being only half connected when a pipeline task gets executed.
 	 */
-	ll_block(cross_core_bind);
+	ll_block(cross_core_bind, flags);
 
 	if (cross_core_bind) {
 #if CONFIG_CROSS_CORE_STREAM
@@ -625,7 +625,7 @@ int ipc_comp_connect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
 		source->direction_set = true;
 	}
 
-	ll_unblock(cross_core_bind);
+	ll_unblock(cross_core_bind, flags);
 
 	return IPC4_SUCCESS;
 
@@ -636,7 +636,7 @@ int ipc_comp_connect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
 e_sink_connect:
 	pipeline_disconnect(source, buffer, PPL_CONN_DIR_COMP_TO_BUFFER);
 free:
-	ll_unblock(cross_core_bind);
+	ll_unblock(cross_core_bind, flags);
 	buffer_free(buffer);
 	return IPC4_INVALID_RESOURCE_STATE;
 }
@@ -653,7 +653,7 @@ int ipc_comp_disconnect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
 	struct comp_dev *src, *sink;
 	struct list_item *sink_list;
 	uint32_t src_id, sink_id, buffer_id;
-	uint32_t flags;
+	uint32_t flags = 0;
 	int ret, ret1;
 	bool cross_core_unbind;
 
@@ -700,19 +700,19 @@ int ipc_comp_disconnect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
 	 * IPC or IDC task getting preempted which could result in buffers being only half connected
 	 * when a pipeline task gets executed.
 	 */
-	ll_block(cross_core_unbind);
+	ll_block(cross_core_unbind, flags);
 
 	if (cross_core_unbind) {
 #if CONFIG_CROSS_CORE_STREAM
 		/* Make sure LL has finished on both cores */
 		if (!cpu_is_me(src->ipc_config.core))
 			if (ll_wait_finished_on_core(src) < 0) {
-				ll_unblock(cross_core_unbind);
+				ll_unblock(cross_core_unbind, flags);
 				return IPC4_FAILURE;
 			}
 		if (!cpu_is_me(sink->ipc_config.core))
 			if (ll_wait_finished_on_core(sink) < 0) {
-				ll_unblock(cross_core_unbind);
+				ll_unblock(cross_core_unbind, flags);
 				return IPC4_FAILURE;
 			}
 #else
@@ -728,7 +728,7 @@ int ipc_comp_disconnect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
 	ret = comp_unbind(src, bu);
 	ret1 = comp_unbind(sink, bu);
 
-	ll_unblock(cross_core_unbind);
+	ll_unblock(cross_core_unbind, flags);
 
 	buffer_free(buffer);