Skip to content

Commit fab9d08

Browse files
serhiy-katsyuba-intelkv2019i
authored andcommitted
ipc4: copier: remove unused endpoint_buffer[]
The use of endpoint buffers in gateways was removed some time ago. endpoint_buffer[] is a leftover from an earlier refactoring, is not used, and can be removed. Signed-off-by: Serhiy Katsyuba <serhiy.katsyuba@intel.com>
1 parent 5a22e9b commit fab9d08

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

src/audio/copier/copier.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,9 @@ struct copier_data {
246246
void *gtw_cfg;
247247
enum ipc4_gateway_type gtw_type;
248248
struct comp_dev *endpoint[IPC4_COPIER_MODULE_OUTPUT_PINS_COUNT];
249-
struct comp_buffer *endpoint_buffer[IPC4_COPIER_MODULE_OUTPUT_PINS_COUNT];
250249
uint32_t endpoint_num;
251250

252-
/* buffer to mux/demux data from/to multiple endpoint buffers for ALH multi-gateway case */
251+
/* buffer to mux/demux data from/to multiple endpoints for ALH multi-gateway case */
253252
struct comp_buffer *multi_endpoint_buffer;
254253

255254
bool bsource_buffer;
@@ -284,10 +283,9 @@ pcm_converter_func get_converter_func(const struct ipc4_audio_format *in_fmt,
284283
uint32_t chmap);
285284

286285
struct comp_ipc_config;
287-
int create_endpoint_buffer(struct comp_dev *dev,
288-
struct copier_data *cd,
289-
const struct ipc4_copier_module_cfg *copier_cfg,
290-
bool create_multi_endpoint_buffer);
286+
int create_multi_endpoint_buffer(struct comp_dev *dev,
287+
struct copier_data *cd,
288+
const struct ipc4_copier_module_cfg *copier_cfg);
291289

292290
enum sof_ipc_stream_direction
293291
get_gateway_direction(enum ipc4_connector_node_id_type node_id_type);

src/audio/copier/copier_dai.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ int copier_dai_create(struct comp_dev *dev, struct copier_data *cd,
351351

352352
/* create multi_endpoint_buffer for ALH multi-gateway case */
353353
if (dai_count > 1) {
354-
ret = create_endpoint_buffer(dev, cd, copier, true);
354+
ret = create_multi_endpoint_buffer(dev, cd, copier);
355355
if (ret < 0)
356356
return ret;
357357
}

src/audio/copier/copier_generic.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,9 @@ void copier_update_params(struct copier_data *cd, struct comp_dev *dev,
347347
}
348348
}
349349

350-
int create_endpoint_buffer(struct comp_dev *dev,
351-
struct copier_data *cd,
352-
const struct ipc4_copier_module_cfg *copier_cfg,
353-
bool create_multi_endpoint_buffer)
350+
int create_multi_endpoint_buffer(struct comp_dev *dev,
351+
struct copier_data *cd,
352+
const struct ipc4_copier_module_cfg *copier_cfg)
354353
{
355354
struct comp_ipc_config *config = &dev->ipc_config;
356355
enum sof_ipc_frame in_frame_fmt, out_frame_fmt;
@@ -438,10 +437,7 @@ int create_endpoint_buffer(struct comp_dev *dev,
438437

439438
audio_buffer_set_hw_params_configured(&buffer->audio_buffer);
440439

441-
if (create_multi_endpoint_buffer)
442-
cd->multi_endpoint_buffer = buffer;
443-
else
444-
cd->endpoint_buffer[cd->endpoint_num] = buffer;
440+
cd->multi_endpoint_buffer = buffer;
445441

446442
return 0;
447443
}

0 commit comments

Comments
 (0)