ipc: ipc4: rename ipc_comp_(dis)connect()

Currently both IPC3 and IPC4 use ipc_comp_connect() and
ipc_comp_disconnect() even though their second parameter has
different types. This makes no sense since both implementations and
calling sites are different. Rename IPC4 versions to drop type-casts.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

src/include/ipc4/handler.h

@@ -68,6 +68,22 @@ int ipc4_set_pipeline_state(struct ipc4_message_request *ipc4);
  */
 void ipc_compound_msg_done(uint32_t msg_id, int error);
 
+/**
+ * \brief Connect components together on a pipeline.
+ * @param ipc The global IPC context.
+ * @param bu IPC4 bind-unbind data.
+ * @return IPC4_SUCCESS on success, error code otherwise.
+ */
+int ipc4_comp_connect(struct ipc *ipc, const struct ipc4_module_bind_unbind *bu);
+
+/**
+ * \brief Disconnect components in a pipeline.
+ * @param ipc The global IPC context.
+ * @param bu IPC4 bind-unbind data.
+ * @return IPC4_SUCCESS on success, error code otherwise.
+ */
+int ipc4_comp_disconnect(struct ipc *ipc, const struct ipc4_module_bind_unbind *bu);
+
 #if defined(__ZEPHYR__) && defined(CONFIG_SOF_FULL_ZEPHYR_APPLICATION)
 /**
  * \brief Increment the IPC compound message pre-start counter.

src/include/sof/ipc/topology.h

@@ -165,7 +165,7 @@ int ipc_pipeline_complete(struct ipc *ipc, uint32_t comp_id);
 /**
  * \brief Connect components together on a pipeline.
  * @param ipc The global IPC context.
- * @param connect Components to connect together..
+ * @param connect Components to connect together.
  * @return 0 on success or negative error.
  */
 int ipc_comp_connect(struct ipc *ipc, ipc_pipe_comp_connect *connect);

src/ipc/ipc4/handler-user.c

@@ -812,7 +812,7 @@ __cold static int ipc4_bind_module_instance(struct ipc4_message_request *ipc4)
 	       (uint32_t)bu->primary.r.module_id, (uint32_t)bu->primary.r.instance_id,
 	       (uint32_t)bu->extension.r.dst_module_id, (uint32_t)bu->extension.r.dst_instance_id);
 
-	return ipc_comp_connect(ipc, (ipc_pipe_comp_connect *)bu);
+	return ipc4_comp_connect(ipc, bu);
 }
 
 __cold static int ipc4_unbind_module_instance(struct ipc4_message_request *ipc4)
@@ -826,7 +826,7 @@ __cold static int ipc4_unbind_module_instance(struct ipc4_message_request *ipc4)
 	       (uint32_t)bu->primary.r.module_id, (uint32_t)bu->primary.r.instance_id,
 	       (uint32_t)bu->extension.r.dst_module_id, (uint32_t)bu->extension.r.dst_instance_id);
 
-	return ipc_comp_disconnect(ipc, (ipc_pipe_comp_connect *)bu);
+	return ipc4_comp_disconnect(ipc, bu);
 }
 #endif /* !CONFIG_SOF_USERSPACE_LL */
 
@@ -1707,8 +1707,7 @@ int ipc_user_thread_dispatch(struct ipc_user *ipc_user)
 			if (result < 0)
 				break;
 
-			result = ipc_comp_connect(ipc_user->ipc,
-						  (ipc_pipe_comp_connect *)&bu);
+			result = ipc4_comp_connect(ipc_user->ipc, &bu);
 			break;
 		}
 		case SOF_IPC4_MOD_UNBIND: {
@@ -1718,8 +1717,7 @@ int ipc_user_thread_dispatch(struct ipc_user *ipc_user)
 			if (result < 0)
 				break;
 
-			result = ipc_comp_disconnect(ipc_user->ipc,
-						     (ipc_pipe_comp_connect *)&bu);
+			result = ipc4_comp_disconnect(ipc_user->ipc, &bu);
 			break;
 		}
 		case SOF_IPC4_MOD_INIT_INSTANCE: {

src/ipc/ipc4/helper.c

@@ -18,6 +18,7 @@
 #include <sof/ipc/topology.h>
 #include <sof/ipc/common.h>
 #include <ipc/dai.h>
+#include <ipc4/handler.h>
 #include <sof/ipc/msg.h>
 #include <sof/lib/mailbox.h>
 #include <sof/lib/memory.h>
@@ -772,9 +773,8 @@ static int ll_wait_finished_on_core(struct comp_dev *dev)
 #endif
 
 /* Only called from ipc4_bind_module_instance(), which is __cold */
-__cold int ipc_comp_connect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
+__cold int ipc4_comp_connect(struct ipc *ipc, const struct ipc4_module_bind_unbind *bu)
 {
-	struct ipc4_module_bind_unbind *bu;
 	struct bind_info bind_data;
 	struct comp_buffer *buffer;
 	struct comp_dev *source;
@@ -790,7 +790,6 @@ __cold int ipc_comp_connect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
 
 	assert_can_be_cold();
 
-	bu = (struct ipc4_module_bind_unbind *)_connect;
 	src_id = IPC4_COMP_ID(bu->primary.r.module_id, bu->primary.r.instance_id);
 	sink_id = IPC4_COMP_ID(bu->extension.r.dst_module_id, bu->extension.r.dst_instance_id);
 	source = ipc4_get_comp_dev(src_id);
@@ -1041,9 +1040,8 @@ __cold int ipc_comp_connect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
  * pipeline and create it in modified form.
  */
 /* Only called from ipc4_unbind_module_instance(), which is __cold */
-__cold int ipc_comp_disconnect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
+__cold int ipc4_comp_disconnect(struct ipc *ipc, const struct ipc4_module_bind_unbind *bu)
 {
-	struct ipc4_module_bind_unbind *bu;
 	struct comp_buffer *buffer = NULL;
 	struct comp_buffer *buf;
 	struct comp_dev *src, *sink;
@@ -1055,7 +1053,6 @@ __cold int ipc_comp_disconnect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
 
 	assert_can_be_cold();
 
-	bu = (struct ipc4_module_bind_unbind *)_connect;
 	src_id = IPC4_COMP_ID(bu->primary.r.module_id, bu->primary.r.instance_id);
 	sink_id = IPC4_COMP_ID(bu->extension.r.dst_module_id, bu->extension.r.dst_instance_id);
 	src = ipc4_get_comp_dev(src_id);