...

src/ipc/ipc3/handler.c

@@ -166,7 +166,6 @@ static bool is_hostless_downstream(struct comp_dev *current)
 /* check if a pipeline is hostless when walking upstream */
 static bool is_hostless_upstream(struct comp_dev *current)
 {
-	struct list_item *clist;
 	struct comp_buffer *buffer;
 
 	/* check if current is a HOST comp */
@@ -181,7 +180,7 @@ static bool is_hostless_upstream(struct comp_dev *current)
 			continue;
 
 		/* dont go upstream if this comp belongs to another pipeline */
-		if (comp_buffer_get_source_state(buffer)->ipc_config.pipeline_id !=
+		if (comp_buffer_get_source_component(buffer)->ipc_config.pipeline_id !=
 		    current->ipc_config.pipeline_id)
 			continue;
 

test/cmocka/src/audio/pipeline/pipeline_connection_mocks.c

@@ -70,8 +70,8 @@ struct pipeline_connect_data *get_standard_connect_objects(void)
 
 	struct comp_buffer *buffer = calloc(sizeof(struct comp_buffer), 1);
 
-	buffer->source = first;
-	buffer->sink = second;
+	buffer->sourceX = first;
+	buffer->sinkX = second;
 	list_init(&buffer->Xsink_list);
 	list_init(&buffer->Xsource_list);
 	pipeline_connect_data->b1 = buffer;

test/cmocka/src/util.h

@@ -32,8 +32,8 @@ static inline struct comp_buffer *create_test_sink(struct comp_dev *dev,
 		list_item_append(&buffer->Xsource_list, &dev->bsink_list);
 
 	/* alloc sink and set default parameters */
-	buffer->sink = calloc(1, sizeof(struct comp_dev));
-	buffer->sink->state = COMP_STATE_PREPARE;
+	buffer->sinkX = calloc(1, sizeof(struct comp_dev));
+	buffer->sinkX->state = COMP_STATE_PREPARE;
 	audio_stream_set_frm_fmt(&buffer->stream, frame_fmt);
 	audio_stream_set_channels(&buffer->stream, channels);
 
@@ -42,7 +42,7 @@ static inline struct comp_buffer *create_test_sink(struct comp_dev *dev,
 
 static inline void free_test_sink(struct comp_buffer *buffer)
 {
-	free(buffer->sink);
+	free(buffer->sinkX);
 	buffer_free(buffer);
 }
 
@@ -67,8 +67,8 @@ static inline struct comp_buffer *create_test_source(struct comp_dev *dev,
 		list_item_append(&buffer->Xsink_list, &dev->bsource_list);
 
 	/* alloc source and set default parameters */
-	buffer->source = calloc(1, sizeof(struct comp_dev));
-	buffer->source->state = COMP_STATE_PREPARE;
+	buffer->sourceX = calloc(1, sizeof(struct comp_dev));
+	buffer->sourceX->state = COMP_STATE_PREPARE;
 	audio_stream_set_frm_fmt(&buffer->stream, frame_fmt);
 	audio_stream_set_channels(&buffer->stream, channels);
 
@@ -77,6 +77,6 @@ static inline struct comp_buffer *create_test_source(struct comp_dev *dev,
 
 static inline void free_test_source(struct comp_buffer *buffer)
 {
-	free(buffer->source);
+	free(buffer->sourceX);
 	buffer_free(buffer);
 }