From 0796a1254ade0416f41b17641b42077edffd5ceb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 6 Aug 2025 06:37:07 +0000 Subject: [PATCH 1/2] Initial plan From eeb1cdc31971776e7fafe07fc2631d32a1bb232d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 6 Aug 2025 06:46:58 +0000 Subject: [PATCH 2/2] Remove function names from logging calls in src/ipc directory Co-authored-by: lyakh <1363683+lyakh@users.noreply.github.com> --- src/ipc/dma-copy.c | 8 +++---- src/ipc/ipc-common.c | 4 ++-- src/ipc/ipc-helper.c | 12 +++++----- src/ipc/ipc3/dai.c | 20 ++++++++--------- src/ipc/ipc3/handler.c | 40 +++++++++++++++++----------------- src/ipc/ipc3/helper.c | 38 ++++++++++++++++---------------- src/ipc/ipc3/host-page-table.c | 12 +++++----- src/ipc/ipc4/dai.c | 16 +++++++------- src/ipc/ipc4/helper.c | 8 +++---- 9 files changed, 79 insertions(+), 79 deletions(-) diff --git a/src/ipc/dma-copy.c b/src/ipc/dma-copy.c index beac3f3b391c..5c45484c614d 100644 --- a/src/ipc/dma-copy.c +++ b/src/ipc/dma-copy.c @@ -46,7 +46,7 @@ static struct dma_sg_elem *sg_get_elem_at(struct dma_sg_config *host_sg, } /* host offset in beyond end of SG buffer */ - tr_err(&dmacpy_tr, "sg_get_elem_at(): host offset in beyond end of SG buffer"); + tr_err(&dmacpy_tr, "host offset in beyond end of SG buffer"); return NULL; } #endif @@ -165,7 +165,7 @@ int dma_copy_new(struct dma_copy *dc) cap = 0; dc->dmac = dma_get(dir, cap, dev, DMA_ACCESS_SHARED); if (!dc->dmac) { - tr_err(&dmacpy_tr, "dma_copy_new(): dc->dmac = NULL"); + tr_err(&dmacpy_tr, "dc->dmac = NULL"); return -ENODEV; } @@ -173,7 +173,7 @@ int dma_copy_new(struct dma_copy *dc) /* get DMA channel from DMAC0 */ dc->chan = dma_channel_get_legacy(dc->dmac, CONFIG_TRACE_CHANNEL); if (!dc->chan) { - tr_err(&dmacpy_tr, "dma_copy_new(): dc->chan is NULL"); + tr_err(&dmacpy_tr, "dc->chan is NULL"); return -ENODEV; } #endif @@ -186,7 +186,7 @@ int dma_copy_set_stream_tag(struct dma_copy *dc, uint32_t stream_tag) /* get DMA channel from DMAC */ dc->chan = dma_channel_get_legacy(dc->dmac, stream_tag - 1); if (!dc->chan) { - tr_err(&dmacpy_tr, "dma_copy_set_stream_tag(): dc->chan is NULL"); + tr_err(&dmacpy_tr, "dc->chan is NULL"); return -EINVAL; } diff --git a/src/ipc/ipc-common.c b/src/ipc/ipc-common.c index 9a07b6b8b715..4bba79dca798 100644 --- a/src/ipc/ipc-common.c +++ b/src/ipc/ipc-common.c @@ -51,7 +51,7 @@ int ipc_process_on_core(uint32_t core, bool blocking) /* check if requested core is enabled */ if (!cpu_is_core_enabled(core)) { - tr_err(&ipc_tr, "ipc_process_on_core(): core #%d is disabled", core); + tr_err(&ipc_tr, "core #%d is disabled", core); return -EACCES; } @@ -290,7 +290,7 @@ __cold int ipc_init(struct sof *sof) { assert_can_be_cold(); - tr_dbg(&ipc_tr, "ipc_init()"); + tr_dbg(&ipc_tr, ""); /* init ipc data */ sof->ipc = rzalloc(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT, sizeof(*sof->ipc)); diff --git a/src/ipc/ipc-helper.c b/src/ipc/ipc-helper.c index 3cca95f74254..896fedf15463 100644 --- a/src/ipc/ipc-helper.c +++ b/src/ipc/ipc-helper.c @@ -140,7 +140,7 @@ int comp_verify_params(struct comp_dev *dev, uint32_t flag, int dir = dev->direction; if (!params) { - comp_err(dev, "comp_verify_params(): !params"); + comp_err(dev, "!params"); return -EINVAL; } @@ -263,14 +263,14 @@ int ipc_pipeline_complete(struct ipc *ipc, uint32_t comp_id) /* find the scheduling component */ icd = ipc_get_comp_by_id(ipc, p->sched_id); if (!icd) { - tr_warn(&ipc_tr, "ipc_pipeline_complete(): no scheduling component specified, use comp 0x%x", + tr_warn(&ipc_tr, "no scheduling component specified, use comp 0x%x", ipc_ppl_sink->id); icd = ipc_ppl_sink; } if (icd->core != ipc_pipe->core) { - tr_err(&ipc_tr, "ipc_pipeline_complete(): icd->core (%d) != ipc_pipe->core (%d) for pipeline scheduling component icd->id 0x%x", + tr_err(&ipc_tr, "icd->core (%d) != ipc_pipe->core (%d) for pipeline scheduling component icd->id 0x%x", icd->core, ipc_pipe->core, icd->id); return -EINVAL; } @@ -298,7 +298,7 @@ __cold int ipc_comp_free(struct ipc *ipc, uint32_t comp_id) /* check whether component exists */ icd = ipc_get_comp_by_id(ipc, comp_id); if (!icd) { - tr_err(&ipc_tr, "ipc_comp_free(): comp id: 0x%x is not found", + tr_err(&ipc_tr, "comp id: 0x%x is not found", comp_id); return -ENODEV; } @@ -309,7 +309,7 @@ __cold int ipc_comp_free(struct ipc *ipc, uint32_t comp_id) /* check state */ if (icd->cd->state != COMP_STATE_READY) { - tr_err(&ipc_tr, "ipc_comp_free(): comp id: 0x%x state is %d cannot be freed", + tr_err(&ipc_tr, "comp id: 0x%x state is %d cannot be freed", comp_id, icd->cd->state); return -EINVAL; } @@ -328,7 +328,7 @@ __cold int ipc_comp_free(struct ipc *ipc, uint32_t comp_id) * leak on error. Bug-free host drivers won't do * this, this was found via fuzzing. */ - tr_err(&ipc_tr, "ipc_comp_free(): uninitialized buffer lists on comp 0x%x\n", + tr_err(&ipc_tr, "uninitialized buffer lists on comp 0x%x\n", icd->id); return -EINVAL; } diff --git a/src/ipc/ipc3/dai.c b/src/ipc/ipc3/dai.c index 4d152deef28b..870459e3a352 100644 --- a/src/ipc/ipc3/dai.c +++ b/src/ipc/ipc3/dai.c @@ -104,7 +104,7 @@ int dai_config_dma_channel(struct dai_data *dd, struct comp_dev *dev, const void break; default: /* other types of DAIs not handled for now */ - comp_err(dev, "dai_config_dma_channel(): Unknown dai type %d", + comp_err(dev, "Unknown dai type %d", config->type); channel = SOF_DMA_CHAN_INVALID; break; @@ -119,7 +119,7 @@ int ipc_dai_data_config(struct dai_data *dd, struct comp_dev *dev) struct sof_ipc_dai_config *config = ipc_from_dai_config(dd->dai_spec_config); if (!config) { - comp_err(dev, "dai_data_config(): no config set for dai %d type %d", + comp_err(dev, "no config set for dai %d type %d", dai->dai_index, dai->type); return -EINVAL; } @@ -129,14 +129,14 @@ int ipc_dai_data_config(struct dai_data *dd, struct comp_dev *dev) /* cannot configure DAI while active */ if (dev->state == COMP_STATE_ACTIVE) { - comp_info(dev, "dai_data_config(): Component is in active state."); + comp_info(dev, "Component is in active state."); return 0; } /* validate direction */ if (dai->direction != SOF_IPC_STREAM_PLAYBACK && dai->direction != SOF_IPC_STREAM_CAPTURE) { - comp_err(dev, "dai_data_config(): no direction set for dai %d type %d", + comp_err(dev, "no direction set for dai %d type %d", dai->dai_index, dai->type); return -EINVAL; } @@ -195,7 +195,7 @@ int ipc_dai_data_config(struct dai_data *dd, struct comp_dev *dev) break; default: /* other types of DAIs not handled for now */ - comp_warn(dev, "dai_data_config(): Unknown dai type %d", + comp_warn(dev, "Unknown dai type %d", config->type); break; } @@ -241,7 +241,7 @@ int ipc_comp_dai_config(struct ipc *ipc, struct ipc_config_dai *common_config, } if (ret < 0) { - tr_err(&ipc_tr, "ipc_comp_dai_config(): comp_dai_config() failed"); + tr_err(&ipc_tr, "comp_dai_config() failed"); return ret; } @@ -281,7 +281,7 @@ void dai_dma_release(struct dai_data *dd, struct comp_dev *dev) { /* cannot configure DAI while active */ if (dev->state == COMP_STATE_ACTIVE) { - comp_info(dev, "dai_config(): Component is in active state. Ignore resetting"); + comp_info(dev, "Component is in active state. Ignore resetting"); return; } @@ -315,7 +315,7 @@ int dai_config(struct dai_data *dd, struct comp_dev *dev, struct ipc_config_dai /* cannot configure DAI while active */ if (dev->state == COMP_STATE_ACTIVE) { - comp_info(dev, "dai_config(): Component is in active state. Ignore config"); + comp_info(dev, "Component is in active state. Ignore config"); return 0; } @@ -328,7 +328,7 @@ int dai_config(struct dai_data *dd, struct comp_dev *dev, struct ipc_config_dai dd->delayed_dma_stop = true; if (dd->chan) { - comp_info(dev, "dai_config(): Configured. dma channel index %d, ignore...", + comp_info(dev, "Configured. dma channel index %d, ignore...", dd->chan->index); return 0; } @@ -379,7 +379,7 @@ int dai_config(struct dai_data *dd, struct comp_dev *dev, struct ipc_config_dai dd->dai_spec_config = rzalloc(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT, sizeof(struct sof_ipc_dai_config)); if (!dd->dai_spec_config) { - comp_err(dev, "dai_config(): No memory for dai_config."); + comp_err(dev, "No memory for dai_config."); return -ENOMEM; } } diff --git a/src/ipc/ipc3/handler.c b/src/ipc/ipc3/handler.c index 196368e1e7eb..f9321779e57a 100644 --- a/src/ipc/ipc3/handler.c +++ b/src/ipc/ipc3/handler.c @@ -996,10 +996,10 @@ static inline int ipc_probe_init(uint32_t header) struct sof_ipc_probe_dma_add_params *params = ipc_get()->comp_data; int dma_provided = params->num_elems; - tr_dbg(&ipc_tr, "ipc_probe_init()"); + tr_dbg(&ipc_tr, ""); if (dma_provided > 1 || dma_provided < 0) { - ipc_cmd_err(&ipc_tr, "ipc_probe_init(): Invalid amount of extraction DMAs specified = %d", + ipc_cmd_err(&ipc_tr, "Invalid amount of extraction DMAs specified = %d", dma_provided); return -EINVAL; } @@ -1009,7 +1009,7 @@ static inline int ipc_probe_init(uint32_t header) static inline int ipc_probe_deinit(uint32_t header) { - tr_dbg(&ipc_tr, "ipc_probe_deinit()"); + tr_dbg(&ipc_tr, ""); return probe_deinit(); } @@ -1019,17 +1019,17 @@ static inline int ipc_probe_dma_add(uint32_t header) struct sof_ipc_probe_dma_add_params *params = ipc_get()->comp_data; int dmas_count = params->num_elems; - tr_dbg(&ipc_tr, "ipc_probe_dma_add()"); + tr_dbg(&ipc_tr, ""); if (dmas_count > CONFIG_PROBE_DMA_MAX) { - ipc_cmd_err(&ipc_tr, "ipc_probe_dma_add(): Invalid amount of injection DMAs specified = %d. Max is " + ipc_cmd_err(&ipc_tr, "Invalid amount of injection DMAs specified = %d. Max is " STRINGIFY(CONFIG_PROBE_DMA_MAX) ".", dmas_count); return -EINVAL; } if (dmas_count <= 0) { - ipc_cmd_err(&ipc_tr, "ipc_probe_dma_add(): Inferred amount of incjection DMAs in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.", + ipc_cmd_err(&ipc_tr, "Inferred amount of incjection DMAs in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.", dmas_count); return -EINVAL; } @@ -1042,17 +1042,17 @@ static inline int ipc_probe_dma_remove(uint32_t header) struct sof_ipc_probe_dma_remove_params *params = ipc_get()->comp_data; int tags_count = params->num_elems; - tr_dbg(&ipc_tr, "ipc_probe_dma_remove()"); + tr_dbg(&ipc_tr, ""); if (tags_count > CONFIG_PROBE_DMA_MAX) { - ipc_cmd_err(&ipc_tr, "ipc_probe_dma_remove(): Invalid amount of injection DMAs specified = %d. Max is " + ipc_cmd_err(&ipc_tr, "Invalid amount of injection DMAs specified = %d. Max is " STRINGIFY(CONFIG_PROBE_DMA_MAX) ".", tags_count); return -EINVAL; } if (tags_count <= 0) { - ipc_cmd_err(&ipc_tr, "ipc_probe_dma_remove(): Inferred amount of incjection DMAs in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.", + ipc_cmd_err(&ipc_tr, "Inferred amount of incjection DMAs in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.", tags_count); return -EINVAL; } @@ -1065,17 +1065,17 @@ static inline int ipc_probe_point_add(uint32_t header) struct sof_ipc_probe_point_add_params *params = ipc_get()->comp_data; int probes_count = params->num_elems; - tr_dbg(&ipc_tr, "ipc_probe_point_add()"); + tr_dbg(&ipc_tr, ""); if (probes_count > CONFIG_PROBE_POINTS_MAX) { - ipc_cmd_err(&ipc_tr, "ipc_probe_point_add(): Invalid amount of Probe Points specified = %d. Max is " + ipc_cmd_err(&ipc_tr, "Invalid amount of Probe Points specified = %d. Max is " STRINGIFY(CONFIG_PROBE_POINT_MAX) ".", probes_count); return -EINVAL; } if (probes_count <= 0) { - ipc_cmd_err(&ipc_tr, "ipc_probe_point_add(): Inferred amount of Probe Points in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.", + ipc_cmd_err(&ipc_tr, "Inferred amount of Probe Points in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.", probes_count); return -EINVAL; } @@ -1088,17 +1088,17 @@ static inline int ipc_probe_point_remove(uint32_t header) struct sof_ipc_probe_point_remove_params *params = ipc_get()->comp_data; int probes_count = params->num_elems; - tr_dbg(&ipc_tr, "ipc_probe_point_remove()"); + tr_dbg(&ipc_tr, ""); if (probes_count > CONFIG_PROBE_POINTS_MAX) { - ipc_cmd_err(&ipc_tr, "ipc_probe_point_remove(): Invalid amount of Probe Points specified = %d. Max is " + ipc_cmd_err(&ipc_tr, "Invalid amount of Probe Points specified = %d. Max is " STRINGIFY(CONFIG_PROBE_POINT_MAX) ".", probes_count); return -EINVAL; } if (probes_count <= 0) { - ipc_cmd_err(&ipc_tr, "ipc_probe_point_remove(): Inferred amount of Probe Points in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.", + ipc_cmd_err(&ipc_tr, "Inferred amount of Probe Points in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.", probes_count); return -EINVAL; } @@ -1111,7 +1111,7 @@ static int ipc_probe_info(uint32_t header) struct sof_ipc_probe_info_params *params = ipc_get()->comp_data; int ret; - tr_dbg(&ipc_tr, "ipc_probe_get_data()"); + tr_dbg(&ipc_tr, ""); switch (cmd) { case SOF_IPC_PROBE_DMA_INFO: @@ -1121,13 +1121,13 @@ static int ipc_probe_info(uint32_t header) ret = probe_point_info(params, SOF_IPC_MSG_MAX_SIZE); break; default: - ipc_cmd_err(&ipc_tr, "ipc_probe_info(): Invalid probe INFO command = %u", + ipc_cmd_err(&ipc_tr, "Invalid probe INFO command = %u", cmd); ret = -EINVAL; } if (ret < 0) { - ipc_cmd_err(&ipc_tr, "ipc_probe_info(): cmd %u failed", cmd); + ipc_cmd_err(&ipc_tr, "cmd %u failed", cmd); return ret; } @@ -1138,7 +1138,7 @@ static int ipc_probe_info(uint32_t header) mailbox_hostbox_write(0, params, params->rhdr.hdr.size); ret = 1; } else { - ipc_cmd_err(&ipc_tr, "ipc_probe_get_data(): probes module returned too much payload for cmd %u - returned %d bytes, max %d", + ipc_cmd_err(&ipc_tr, "probes module returned too much payload for cmd %u - returned %d bytes, max %d", cmd, params->rhdr.hdr.size, MIN(MAILBOX_HOSTBOX_SIZE, SOF_IPC_MSG_MAX_SIZE)); ret = -EINVAL; @@ -1177,7 +1177,7 @@ static int ipc_glb_probe(uint32_t header) #else static inline int ipc_glb_probe(uint32_t header) { - ipc_cmd_err(&ipc_tr, "ipc_glb_probe(): Probes not enabled by Kconfig."); + ipc_cmd_err(&ipc_tr, "Probes not enabled by Kconfig."); return -EINVAL; } diff --git a/src/ipc/ipc3/helper.c b/src/ipc/ipc3/helper.c index f4b765988b14..6a725081ff19 100644 --- a/src/ipc/ipc3/helper.c +++ b/src/ipc/ipc3/helper.c @@ -95,7 +95,7 @@ static const struct comp_driver *get_drv(struct sof_ipc_comp *comp) } if (!drv) - tr_err(&comp_tr, "get_drv(): driver not found, comp->type = %u", + tr_err(&comp_tr, "driver not found, comp->type = %u", comp->type); goto out; @@ -142,7 +142,7 @@ static const struct comp_driver *get_drv(struct sof_ipc_comp *comp) if (!drv) tr_err(&comp_tr, - "get_drv(): the provided UUID (%8x%8x%8x%8x) doesn't match to any driver!", + "the provided UUID (%8x%8x%8x%8x) doesn't match to any driver!", *(uint32_t *)(&comp_ext->uuid[0]), *(uint32_t *)(&comp_ext->uuid[4]), *(uint32_t *)(&comp_ext->uuid[8]), @@ -363,13 +363,13 @@ struct comp_dev *comp_new(struct sof_ipc_comp *comp) /* build the component */ if (comp_specific_builder(comp, &spec) < 0) { - comp_cl_err(drv, "comp_new(): component type not recognized"); + comp_cl_err(drv, "component type not recognized"); return NULL; } comp_common_builder(comp, &config); cdev = drv->ops.create(drv, &config, &spec); if (!cdev) { - comp_cl_err(drv, "comp_new(): unable to create the new component"); + comp_cl_err(drv, "unable to create the new component"); return NULL; } @@ -389,7 +389,7 @@ int ipc_pipeline_new(struct ipc *ipc, ipc_pipe_new *_pipe_desc) /* check whether the pipeline already exists */ ipc_pipe = ipc_get_pipeline_by_id(ipc, pipe_desc->comp_id); if (ipc_pipe != NULL) { - tr_err(&ipc_tr, "ipc_pipeline_new(): pipeline already exists, pipe_desc->comp_id = %u", + tr_err(&ipc_tr, "pipeline already exists, pipe_desc->comp_id = %u", pipe_desc->comp_id); return -EINVAL; } @@ -398,7 +398,7 @@ int ipc_pipeline_new(struct ipc *ipc, ipc_pipe_new *_pipe_desc) pipe = pipeline_new(pipe_desc->pipeline_id, pipe_desc->priority, pipe_desc->comp_id); if (!pipe) { - tr_err(&ipc_tr, "ipc_pipeline_new(): pipeline_new() failed"); + tr_err(&ipc_tr, "pipeline_new() failed"); return -ENOMEM; } @@ -412,7 +412,7 @@ int ipc_pipeline_new(struct ipc *ipc, ipc_pipe_new *_pipe_desc) /* set xrun time limit */ ret = pipeline_xrun_set_limit(pipe, pipe_desc->xrun_limit_usecs); if (ret) { - tr_err(&ipc_tr, "ipc_pipeline_new(): pipeline_xrun_set_limit() failed"); + tr_err(&ipc_tr, "pipeline_xrun_set_limit() failed"); pipeline_free(pipe); return ret; } @@ -448,7 +448,7 @@ int ipc_pipeline_free(struct ipc *ipc, uint32_t comp_id) /* check type */ if (ipc_pipe->type != COMP_TYPE_PIPELINE) { - tr_err(&ipc_tr, "ipc_pipeline_free(): comp id: %d is not a PIPELINE", + tr_err(&ipc_tr, "comp id: %d is not a PIPELINE", comp_id); return -EINVAL; } @@ -460,7 +460,7 @@ int ipc_pipeline_free(struct ipc *ipc, uint32_t comp_id) /* free buffer and remove from list */ ret = pipeline_free(ipc_pipe->pipeline); if (ret < 0) { - tr_err(&ipc_tr, "ipc_pipeline_free(): pipeline_free() failed"); + tr_err(&ipc_tr, "pipeline_free() failed"); return ret; } ipc_pipe->pipeline = NULL; @@ -479,7 +479,7 @@ int ipc_buffer_new(struct ipc *ipc, const struct sof_ipc_buffer *desc) /* check whether buffer already exists */ ibd = ipc_get_buffer_by_id(ipc, desc->comp.id); if (ibd != NULL) { - tr_err(&ipc_tr, "ipc_buffer_new(): buffer already exists, desc->comp.id = %u", + tr_err(&ipc_tr, "buffer already exists, desc->comp.id = %u", desc->comp.id); return -EINVAL; } @@ -487,7 +487,7 @@ int ipc_buffer_new(struct ipc *ipc, const struct sof_ipc_buffer *desc) /* register buffer with pipeline */ buffer = buffer_new(desc, false); if (!buffer) { - tr_err(&ipc_tr, "ipc_buffer_new(): buffer_new() failed"); + tr_err(&ipc_tr, "buffer_new() failed"); return -ENOMEM; } @@ -574,7 +574,7 @@ int ipc_buffer_free(struct ipc *ipc, uint32_t buffer_id) if (active_comp->state > COMP_STATE_READY && core != ibd->core && core != cpu_get_id()) { - tr_dbg(&ipc_tr, "ipc_buffer_free(): comp id: %d run on sink core %u", + tr_dbg(&ipc_tr, "comp id: %d run on sink core %u", buffer_id, core); ibd->core = core; return ipc_process_on_core(core, false); @@ -639,14 +639,14 @@ int ipc_comp_connect(struct ipc *ipc, ipc_pipe_comp_connect *_connect) /* check whether the components already exist */ icd_source = ipc_get_comp_dev(ipc, COMP_TYPE_ANY, connect->source_id); if (!icd_source) { - tr_err(&ipc_tr, "ipc_comp_connect(): source component does not exist, source_id = %u sink_id = %u", + tr_err(&ipc_tr, "source component does not exist, source_id = %u sink_id = %u", connect->source_id, connect->sink_id); return -EINVAL; } icd_sink = ipc_get_comp_dev(ipc, COMP_TYPE_ANY, connect->sink_id); if (!icd_sink) { - tr_err(&ipc_tr, "ipc_comp_connect(): sink component does not exist, source_id = %d sink_id = %u", + tr_err(&ipc_tr, "sink component does not exist, source_id = %d sink_id = %u", connect->sink_id, connect->source_id); return -EINVAL; } @@ -659,7 +659,7 @@ int ipc_comp_connect(struct ipc *ipc, ipc_pipe_comp_connect *_connect) icd_sink->type == COMP_TYPE_BUFFER) return ipc_comp_to_buffer_connect(icd_source, icd_sink); else { - tr_err(&ipc_tr, "ipc_comp_connect(): invalid source and sink types, connect->source_id = %u, connect->sink_id = %u", + tr_err(&ipc_tr, "invalid source and sink types, connect->source_id = %u, connect->sink_id = %u", connect->source_id, connect->sink_id); return -EINVAL; } @@ -673,21 +673,21 @@ int ipc_comp_new(struct ipc *ipc, ipc_comp *_comp) /* check core is valid */ if (comp->core >= CONFIG_CORE_COUNT) { - tr_err(&ipc_tr, "ipc_comp_new(): comp->core = %u", comp->core); + tr_err(&ipc_tr, "comp->core = %u", comp->core); return -EINVAL; } /* check whether component already exists */ icd = ipc_get_comp_by_id(ipc, comp->id); if (icd != NULL) { - tr_err(&ipc_tr, "ipc_comp_new(): comp->id = %u", comp->id); + tr_err(&ipc_tr, "comp->id = %u", comp->id); return -EINVAL; } /* create component */ cd = comp_new(comp); if (!cd) { - tr_err(&ipc_tr, "ipc_comp_new(): component cd = NULL"); + tr_err(&ipc_tr, "component cd = NULL"); return -EINVAL; } @@ -695,7 +695,7 @@ int ipc_comp_new(struct ipc *ipc, ipc_comp *_comp) icd = rzalloc(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT, sizeof(struct ipc_comp_dev)); if (!icd) { - tr_err(&ipc_tr, "ipc_comp_new(): alloc failed"); + tr_err(&ipc_tr, "alloc failed"); rfree(cd); return -ENOMEM; } diff --git a/src/ipc/ipc3/host-page-table.c b/src/ipc/ipc3/host-page-table.c index e4d36cc9640c..7a3da31caa82 100644 --- a/src/ipc/ipc3/host-page-table.c +++ b/src/ipc/ipc3/host-page-table.c @@ -38,14 +38,14 @@ static int ipc_parse_page_descriptors(uint8_t *page_table, if ((ring->size <= HOST_PAGE_SIZE * (ring->pages - 1)) || (ring->size > HOST_PAGE_SIZE * ring->pages)) { /* error buffer size */ - tr_err(&ipc_tr, "ipc_parse_page_descriptors(): error buffer size"); + tr_err(&ipc_tr, "error buffer size"); return -EINVAL; } elem_array->elems = rzalloc(SOF_MEM_FLAG_USER, sizeof(struct dma_sg_elem) * ring->pages); if (!elem_array->elems) { - tr_err(&ipc_tr, "ipc_parse_page_descriptors(): There is no heap free with this block size: %zu", + tr_err(&ipc_tr, "There is no heap free with this block size: %zu", sizeof(struct dma_sg_elem) * ring->pages); return -ENOMEM; } @@ -157,7 +157,7 @@ static int ipc_get_page_descriptors(struct dma *dmac, uint8_t *page_table, /* get DMA channel from DMAC */ chan = dma_channel_get_legacy(dmac, 0); if (!chan) { - tr_err(&ipc_tr, "ipc_get_page_descriptors(): chan is NULL"); + tr_err(&ipc_tr, "chan is NULL"); return -ENODEV; } @@ -178,7 +178,7 @@ static int ipc_get_page_descriptors(struct dma *dmac, uint8_t *page_table, /* 20 bits for each page, round up to minimum DMA copy size */ ret = dma_get_attribute_legacy(dmac, DMA_ATTR_COPY_ALIGNMENT, &dma_copy_align); if (ret < 0) { - tr_err(&ipc_tr, "ipc_get_page_descriptors(): dma_get_attribute() failed"); + tr_err(&ipc_tr, "dma_get_attribute() failed"); goto out; } elem.size = SOF_DIV_ROUND_UP(ring->pages * 20, 8); @@ -188,14 +188,14 @@ static int ipc_get_page_descriptors(struct dma *dmac, uint8_t *page_table, ret = dma_set_config_legacy(chan, &config); if (ret < 0) { - tr_err(&ipc_tr, "ipc_get_page_descriptors(): dma_set_config() failed"); + tr_err(&ipc_tr, "dma_set_config() failed"); goto out; } /* start the copy of page table to DSP */ ret = dma_copy_legacy(chan, elem.size, DMA_COPY_ONE_SHOT | DMA_COPY_BLOCKING); if (ret < 0) { - tr_err(&ipc_tr, "ipc_get_page_descriptors(): dma_start() failed"); + tr_err(&ipc_tr, "dma_start() failed"); goto out; } diff --git a/src/ipc/ipc4/dai.c b/src/ipc/ipc4/dai.c index ba25bd13a989..94fbd1823945 100644 --- a/src/ipc/ipc4/dai.c +++ b/src/ipc/ipc4/dai.c @@ -118,7 +118,7 @@ int dai_config_dma_channel(struct dai_data *dd, struct comp_dev *dev, const void break; default: /* other types of DAIs not handled for now */ - comp_err(dev, "dai_config_dma_channel(): Unknown dai type %d", dai->type); + comp_err(dev, "Unknown dai type %d", dai->type); channel = SOF_DMA_CHAN_INVALID; break; } @@ -135,7 +135,7 @@ int ipc_dai_data_config(struct dai_data *dd, struct comp_dev *dev) #endif if (!dai) { - comp_err(dev, "dai_data_config(): no dai!\n"); + comp_err(dev, "no dai!\n"); return -EINVAL; } @@ -144,7 +144,7 @@ int ipc_dai_data_config(struct dai_data *dd, struct comp_dev *dev) /* cannot configure DAI while active */ if (dev->state == COMP_STATE_ACTIVE) { - comp_info(dev, "dai_data_config(): Component is in active state."); + comp_info(dev, "Component is in active state."); return 0; } @@ -180,7 +180,7 @@ int ipc_dai_data_config(struct dai_data *dd, struct comp_dev *dev) break; default: /* other types of DAIs not handled for now */ - comp_warn(dev, "dai_data_config(): Unknown dai type %d", dai->type); + comp_warn(dev, "Unknown dai type %d", dai->type); return -EINVAL; } @@ -201,7 +201,7 @@ void dai_dma_release(struct dai_data *dd, struct comp_dev *dev) { /* cannot configure DAI while active */ if (dev->state == COMP_STATE_ACTIVE) { - comp_info(dev, "dai_config(): Component is in active state. Ignore resetting"); + comp_info(dev, "Component is in active state. Ignore resetting"); return; } @@ -351,12 +351,12 @@ __cold int dai_config(struct dai_data *dd, struct comp_dev *dev, /* cannot configure DAI while active */ if (dev->state == COMP_STATE_ACTIVE) { - comp_info(dev, "dai_config(): Component is in active state. Ignore config"); + comp_info(dev, "Component is in active state. Ignore config"); return 0; } if (dd->chan) { - comp_info(dev, "dai_config(): Configured. dma channel index %d, ignore...", + comp_info(dev, "Configured. dma channel index %d, ignore...", dd->chan->index); return 0; } @@ -380,7 +380,7 @@ __cold int dai_config(struct dai_data *dd, struct comp_dev *dev, size = sizeof(*copier_cfg); dd->dai_spec_config = rzalloc(SOF_MEM_FLAG_USER, size); if (!dd->dai_spec_config) { - comp_err(dev, "dai_config(): No memory for dai_config size %d", size); + comp_err(dev, "No memory for dai_config size %d", size); return -ENOMEM; } diff --git a/src/ipc/ipc4/helper.c b/src/ipc/ipc4/helper.c index 913d38ca835e..4e2f54db3553 100644 --- a/src/ipc/ipc4/helper.c +++ b/src/ipc/ipc4/helper.c @@ -371,14 +371,14 @@ __cold int ipc_pipeline_free(struct ipc *ipc, uint32_t comp_id) ret = ipc_pipeline_module_free(ipc_pipe->pipeline->pipeline_id); if (ret != IPC4_SUCCESS) { - tr_err(&ipc_tr, "ipc_pipeline_free(): module free () failed"); + tr_err(&ipc_tr, "module free () failed"); return ret; } /* free buffer, delete all tasks and remove from list */ ret = pipeline_free(ipc_pipe->pipeline); if (ret < 0) { - tr_err(&ipc_tr, "ipc_pipeline_free(): pipeline_free() failed"); + tr_err(&ipc_tr, "pipeline_free() failed"); return IPC4_INVALID_RESOURCE_STATE; } @@ -986,7 +986,7 @@ __cold static const struct comp_driver *ipc4_get_drv(const void *uuid) } tr_warn(&comp_tr, - "get_drv(): the provided UUID (%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x) can't be found!", + "the provided UUID (%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x) can't be found!", sof_uuid->a, sof_uuid->b, sof_uuid->c, sof_uuid->d[0], sof_uuid->d[1], sof_uuid->d[2], sof_uuid->d[3], sof_uuid->d[4], sof_uuid->d[5], sof_uuid->d[6], sof_uuid->d[7]); @@ -1095,7 +1095,7 @@ __cold static int ipc4_add_comp_dev(struct comp_dev *dev) icd = rzalloc(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT, sizeof(struct ipc_comp_dev)); if (!icd) { - tr_err(&ipc_tr, "ipc_comp_new(): alloc failed"); + tr_err(&ipc_tr, "alloc failed"); rfree(icd); return IPC4_OUT_OF_MEMORY; }