diff --git a/src/audio/aria/aria.c b/src/audio/aria/aria.c index 7357475e92ae..2f558eb2d6d9 100644 --- a/src/audio/aria/aria.c +++ b/src/audio/aria/aria.c @@ -139,7 +139,7 @@ static int aria_init(struct processing_module *mod) att = aria->attenuation; if (aria->attenuation > ARIA_MAX_ATT) { - comp_warn(dev, "init_aria(): Attenuation value %d must not be greater than %d", + comp_warn(dev, "Attenuation value %d must not be greater than %d", att, ARIA_MAX_ATT); att = ARIA_MAX_ATT; } @@ -149,7 +149,7 @@ static int aria_init(struct processing_module *mod) if (!buf) { rfree(cd); - comp_err(dev, "init_aria(): allocation failed for size %d", req_mem); + comp_err(dev, "allocation failed for size %d", req_mem); return -ENOMEM; } @@ -201,12 +201,12 @@ static int aria_prepare(struct processing_module *mod, if (audio_stream_get_valid_fmt(&source->stream) != SOF_IPC_FRAME_S24_4LE || audio_stream_get_valid_fmt(&sink->stream) != SOF_IPC_FRAME_S24_4LE) { - comp_err(dev, "aria_prepare(): format is not supported"); + comp_err(dev, "format is not supported"); return -EINVAL; } if (dev->state == COMP_STATE_ACTIVE) { - comp_info(dev, "aria_prepare(): Component is in active state."); + comp_info(dev, "Component is in active state."); return 0; } @@ -291,7 +291,7 @@ static int aria_set_config(struct processing_module *mod, uint32_t param_id, memcpy_s(&cd->att, sizeof(uint32_t), fragment, sizeof(uint32_t)); if (cd->att > ARIA_MAX_ATT) { comp_warn(dev, - "aria_set_config(): Attenuation parameter %d is limited to %d", + "Attenuation parameter %d is limited to %d", cd->att, ARIA_MAX_ATT); cd->att = ARIA_MAX_ATT; } diff --git a/src/audio/asrc/asrc.c b/src/audio/asrc/asrc.c index 5c1e71e6bf82..2d77a04c380f 100644 --- a/src/audio/asrc/asrc.c +++ b/src/audio/asrc/asrc.c @@ -354,14 +354,14 @@ static int asrc_verify_params(struct processing_module *mod, if (dev->direction == SOF_IPC_STREAM_PLAYBACK) { if (asrc_get_source_rate(&cd->ipc_config) && params->rate != asrc_get_source_rate(&cd->ipc_config)) { - comp_err(dev, "asrc_verify_params(): runtime stream pcm rate %u does not match rate %u fetched from ipc.", + comp_err(dev, "runtime stream pcm rate %u does not match rate %u fetched from ipc.", params->rate, asrc_get_source_rate(&cd->ipc_config)); return -EINVAL; } } else { if (asrc_get_sink_rate(&cd->ipc_config) && params->rate != asrc_get_sink_rate(&cd->ipc_config)) { - comp_err(dev, "asrc_verify_params(): runtime stream pcm rate %u does not match rate %u fetched from ipc.", + comp_err(dev, "runtime stream pcm rate %u does not match rate %u fetched from ipc.", params->rate, asrc_get_sink_rate(&cd->ipc_config)); return -EINVAL; } @@ -371,7 +371,7 @@ static int asrc_verify_params(struct processing_module *mod, */ ret = comp_verify_params(dev, BUFF_PARAMS_RATE, params); if (ret < 0) { - comp_err(dev, "asrc_verify_params(): comp_verify_params() failed."); + comp_err(dev, "comp_verify_params() failed."); return ret; } @@ -393,7 +393,7 @@ static int asrc_params(struct processing_module *mod) err = asrc_verify_params(mod, pcm_params); if (err < 0) { - comp_err(dev, "asrc_params(): pcm params verification failed."); + comp_err(dev, "pcm params verification failed."); return -EINVAL; } @@ -572,7 +572,7 @@ static int asrc_prepare(struct processing_module *mod, if (audio_stream_get_size(&sinkb->stream) < dev->ipc_config.periods_sink * sink_period_bytes) { - comp_err(dev, "asrc_prepare(): sink buffer size %d is insufficient < %d * %d", + comp_err(dev, "sink buffer size %d is insufficient < %d * %d", audio_stream_get_size(&sinkb->stream), dev->ipc_config.periods_sink, sink_period_bytes); ret = -ENOMEM; diff --git a/src/audio/asrc/asrc_farrow.c b/src/audio/asrc/asrc_farrow.c index d43cbb79c782..987a11408af0 100644 --- a/src/audio/asrc/asrc_farrow.c +++ b/src/audio/asrc/asrc_farrow.c @@ -1367,7 +1367,7 @@ enum asrc_error_code asrc_process_pull32(struct comp_dev *dev, } if (src_obj->time_value_pull > TIME_VALUE_LIMIT) { - comp_err(dev, "process_pull32(): Time value = %d", + comp_err(dev, "Time value = %d", src_obj->time_value_pull); return ASRC_EC_FAILED_PULL_MODE; } diff --git a/src/audio/base_fw_intel.c b/src/audio/base_fw_intel.c index 2642fd3f7368..fc2e97597ed1 100644 --- a/src/audio/base_fw_intel.c +++ b/src/audio/base_fw_intel.c @@ -184,7 +184,7 @@ __cold static int basefw_mem_state_info(uint32_t *data_offset, char *data) /* size is also saved as tuple length */ tuple_data = rballoc(SOF_MEM_FLAG_USER, size); if (!tuple_data) { - LOG_ERR("basefw_mem_state_info(): allocation failed"); + LOG_ERR("allocation failed"); return IPC4_ERROR_INVALID_PARAM; } diff --git a/src/audio/buffers/comp_buffer.c b/src/audio/buffers/comp_buffer.c index bf6fc8a65659..8b21b06c454d 100644 --- a/src/audio/buffers/comp_buffer.c +++ b/src/audio/buffers/comp_buffer.c @@ -201,7 +201,7 @@ static struct comp_buffer *buffer_alloc_struct(void *stream_addr, size_t size, buffer = rzalloc(flags, sizeof(*buffer)); if (!buffer) { - tr_err(&buffer_tr, "buffer_alloc_struct(): could not alloc structure"); + tr_err(&buffer_tr, "could not alloc structure"); return NULL; } @@ -236,20 +236,20 @@ struct comp_buffer *buffer_alloc(size_t size, uint32_t flags, uint32_t align, /* validate request */ if (size == 0) { - tr_err(&buffer_tr, "buffer_alloc(): new size = %zu is invalid", size); + tr_err(&buffer_tr, "new size = %zu is invalid", size); return NULL; } stream_addr = rballoc_align(flags, size, align); if (!stream_addr) { - tr_err(&buffer_tr, "buffer_alloc(): could not alloc size = %zu bytes of flags = 0x%x", + tr_err(&buffer_tr, "could not alloc size = %zu bytes of flags = 0x%x", size, flags); return NULL; } buffer = buffer_alloc_struct(stream_addr, size, flags, is_shared); if (!buffer) { - tr_err(&buffer_tr, "buffer_alloc(): could not alloc buffer structure"); + tr_err(&buffer_tr, "could not alloc buffer structure"); rfree(stream_addr); } @@ -263,11 +263,11 @@ struct comp_buffer *buffer_alloc_range(size_t preferred_size, size_t minimum_siz size_t size; void *stream_addr = NULL; - tr_dbg(&buffer_tr, "buffer_alloc_range(): %zu -- %zu bytes", minimum_size, preferred_size); + tr_dbg(&buffer_tr, "%zu -- %zu bytes", minimum_size, preferred_size); /* validate request */ if (minimum_size == 0 || preferred_size < minimum_size) { - tr_err(&buffer_tr, "buffer_alloc_range(): new size range %zu -- %zu is invalid", + tr_err(&buffer_tr, "new size range %zu -- %zu is invalid", minimum_size, preferred_size); return NULL; } @@ -282,17 +282,17 @@ struct comp_buffer *buffer_alloc_range(size_t preferred_size, size_t minimum_siz break; } - tr_dbg(&buffer_tr, "buffer_alloc_range(): allocated %zu bytes", size); + tr_dbg(&buffer_tr, "allocated %zu bytes", size); if (!stream_addr) { - tr_err(&buffer_tr, "buffer_alloc_range(): could not alloc size = %zu bytes of type = 0x%x", + tr_err(&buffer_tr, "could not alloc size = %zu bytes of type = 0x%x", minimum_size, flags); return NULL; } buffer = buffer_alloc_struct(stream_addr, size, flags, is_shared); if (!buffer) { - tr_err(&buffer_tr, "buffer_alloc_range(): could not alloc buffer structure"); + tr_err(&buffer_tr, "could not alloc buffer structure"); rfree(stream_addr); } diff --git a/src/audio/chain_dma.c b/src/audio/chain_dma.c index f597dc1e4759..6ca79338c762 100644 --- a/src/audio/chain_dma.c +++ b/src/audio/chain_dma.c @@ -84,7 +84,7 @@ static int chain_host_start(struct comp_dev *dev) if (err < 0) return err; - comp_info(dev, "chain_host_start(): dma_start() host chan_index = %u", + comp_info(dev, "dma_start() host chan_index = %u", cd->chan_host->index); return 0; } @@ -470,7 +470,7 @@ __cold static int chain_init(struct comp_dev *dev, void *addr, size_t length) channel = cd->host_connector_node_id.f.v_index; channel = dma_request_channel(cd->dma_host->z_dev, &channel); if (channel < 0) { - comp_err(dev, "chain_init(): dma_request_channel() failed"); + comp_err(dev, "dma_request_channel() failed"); return -EINVAL; } diff --git a/src/audio/channel_map.c b/src/audio/channel_map.c index a2ef0a5528dc..b743fdacb0cd 100644 --- a/src/audio/channel_map.c +++ b/src/audio/channel_map.c @@ -28,7 +28,7 @@ struct sof_ipc_channel_map *chmap_get(struct sof_ipc_stream_map *smap, uint32_t byte = 0; if (index >= smap->num_ch_map) { - tr_err(&chmap_tr, "chmap_get(): index %d out of bounds %d", + tr_err(&chmap_tr, "index %d out of bounds %d", index, smap->num_ch_map); return NULL; diff --git a/src/audio/codec/dts/dts.c b/src/audio/codec/dts/dts.c index 83a112ab0ae3..84a6b7c6effc 100644 --- a/src/audio/codec/dts/dts.c +++ b/src/audio/codec/dts/dts.c @@ -251,7 +251,7 @@ dts_codec_process(struct processing_module *mod, /* Proceed only if we have enough data to fill the module buffer completely */ if (input_buffers[0].size < codec->mpd.in_buff_size) { - comp_dbg(dev, "dts_codec_process(): not enough data to process"); + comp_dbg(dev, "not enough data to process"); return -ENODATA; } @@ -427,21 +427,21 @@ dts_codec_set_configuration(struct processing_module *mod, uint32_t config_id, ret = module_set_configuration(mod, config_id, pos, data_offset_size, fragment, fragment_size, response, response_size); if (ret < 0) { - comp_err(dev, "dts_codec_set_configuration(): error %x from module_set_configuration()", + comp_err(dev, "error %x from module_set_configuration()", ret); return ret; } /* return if more fragments are expected */ if (pos != MODULE_CFG_FRAGMENT_LAST && pos != MODULE_CFG_FRAGMENT_SINGLE) { - comp_err(dev, "dts_codec_set_configuration(): pos %d error", pos); + comp_err(dev, "pos %d error", pos); return 0; } #if CONFIG_IPC_MAJOR_3 // return if the module is not prepared if (md->state < MODULE_INITIALIZED) { - comp_err(dev, "dts_codec_set_configuration(): state %d error", md->state); + comp_err(dev, "state %d error", md->state); return 0; } #endif @@ -449,12 +449,12 @@ dts_codec_set_configuration(struct processing_module *mod, uint32_t config_id, /* whole configuration received, apply it now */ ret = dts_codec_apply_config(mod); if (ret) { - comp_err(dev, "dts_codec_set_configuration(): error %x: runtime config apply failed", + comp_err(dev, "error %x: runtime config apply failed", ret); return ret; } - comp_dbg(dev, "dts_codec_set_configuration(): config applied"); + comp_dbg(dev, "config applied"); return 0; } diff --git a/src/audio/component.c b/src/audio/component.c index b60e8bc22b39..8b5cc022e98f 100644 --- a/src/audio/component.c +++ b/src/audio/component.c @@ -115,14 +115,14 @@ int comp_set_state(struct comp_dev *dev, int cmd) switch (cmd) { case COMP_TRIGGER_START: if (dev->state != COMP_STATE_PRE_ACTIVE) { - comp_err(dev, "comp_set_state(): wrong state = %u, COMP_TRIGGER_START", + comp_err(dev, "wrong state = %u, COMP_TRIGGER_START", dev->state); return -EINVAL; } break; case COMP_TRIGGER_RELEASE: if (dev->state != COMP_STATE_PRE_ACTIVE) { - comp_err(dev, "comp_set_state(): wrong state = %u, COMP_TRIGGER_RELEASE", + comp_err(dev, "wrong state = %u, COMP_TRIGGER_RELEASE", dev->state); return -EINVAL; } @@ -130,7 +130,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) case COMP_TRIGGER_STOP: if (dev->state != COMP_STATE_ACTIVE && dev->state != COMP_STATE_PAUSED) { - comp_err(dev, "comp_set_state(): wrong state = %u, COMP_TRIGGER_STOP", + comp_err(dev, "wrong state = %u, COMP_TRIGGER_STOP", dev->state); return -EINVAL; } @@ -138,7 +138,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) case COMP_TRIGGER_PAUSE: /* only support pausing for running */ if (dev->state != COMP_STATE_ACTIVE) { - comp_err(dev, "comp_set_state(): wrong state = %u, COMP_TRIGGER_PAUSE", + comp_err(dev, "wrong state = %u, COMP_TRIGGER_PAUSE", dev->state); return -EINVAL; } @@ -146,15 +146,15 @@ int comp_set_state(struct comp_dev *dev, int cmd) case COMP_TRIGGER_RESET: /* reset always succeeds */ if (dev->state == COMP_STATE_ACTIVE) - comp_err(dev, "comp_set_state(): wrong state = %u, COMP_TRIGGER_RESET", + comp_err(dev, "wrong state = %u, COMP_TRIGGER_RESET", dev->state); else if (dev->state == COMP_STATE_PAUSED) - comp_info(dev, "comp_set_state(): state = %u, COMP_TRIGGER_RESET", + comp_info(dev, "state = %u, COMP_TRIGGER_RESET", dev->state); break; case COMP_TRIGGER_PREPARE: if (dev->state != COMP_STATE_READY) { - comp_err(dev, "comp_set_state(): wrong state = %u, COMP_TRIGGER_PREPARE", + comp_err(dev, "wrong state = %u, COMP_TRIGGER_PREPARE", dev->state); return -EINVAL; } @@ -162,7 +162,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) case COMP_TRIGGER_PRE_START: if (dev->state != COMP_STATE_PREPARE) { comp_err(dev, - "comp_set_state(): wrong state = %u, COMP_TRIGGER_PRE_START", + "wrong state = %u, COMP_TRIGGER_PRE_START", dev->state); return -EINVAL; } @@ -170,7 +170,7 @@ int comp_set_state(struct comp_dev *dev, int cmd) case COMP_TRIGGER_PRE_RELEASE: if (dev->state != COMP_STATE_PAUSED) { comp_err(dev, - "comp_set_state(): wrong state = %u, COMP_TRIGGER_PRE_RELEASE", + "wrong state = %u, COMP_TRIGGER_PRE_RELEASE", dev->state); return -EINVAL; } diff --git a/src/audio/copier/copier_ipcgtw.c b/src/audio/copier/copier_ipcgtw.c index 254b62ea29f7..ea518b5e12f2 100644 --- a/src/audio/copier/copier_ipcgtw.c +++ b/src/audio/copier/copier_ipcgtw.c @@ -102,7 +102,7 @@ int copier_ipcgtw_process(const struct ipc4_ipcgtw_cmd *cmd, if (!dev) return -ENODEV; - comp_dbg(dev, "copier_ipcgtw_process(): %x %x", + comp_dbg(dev, "%x %x", cmd->primary.dat, cmd->extension.dat); buf = get_buffer(dev); @@ -113,7 +113,7 @@ int copier_ipcgtw_process(const struct ipc4_ipcgtw_cmd *cmd, * case do not report error but return 0 bytes available for GET_DATA and * 0 bytes free for SET_DATA. */ - comp_warn(dev, "copier_ipcgtw_process(): no buffer found"); + comp_warn(dev, "no buffer found"); } out = (struct ipc4_ipc_gateway_cmd_data_reply *)reply_payload; @@ -162,7 +162,7 @@ int copier_ipcgtw_process(const struct ipc4_ipcgtw_cmd *cmd, break; default: - comp_err(dev, "copier_ipcgtw_process(): unexpected cmd: %u", + comp_err(dev, "unexpected cmd: %u", (unsigned int)cmd->primary.r.cmd); return -EINVAL; } @@ -180,7 +180,7 @@ int copier_ipcgtw_params(struct ipcgtw_data *ipcgtw_data, struct comp_dev *dev, buf = get_buffer(dev); if (!buf) { - comp_err(dev, "ipcgtw_params(): no buffer found"); + comp_err(dev, "no buffer found"); return -EINVAL; } @@ -188,7 +188,7 @@ int copier_ipcgtw_params(struct ipcgtw_data *ipcgtw_data, struct comp_dev *dev, err = buffer_set_size(buf, ipcgtw_data->buf_size, 0); if (err < 0) { - comp_err(dev, "ipcgtw_params(): failed to resize buffer to %u bytes", + comp_err(dev, "failed to resize buffer to %u bytes", ipcgtw_data->buf_size); return err; } @@ -203,7 +203,7 @@ void copier_ipcgtw_reset(struct comp_dev *dev) if (buf) { audio_stream_reset(&buf->stream); } else { - comp_warn(dev, "ipcgtw_reset(): no buffer found"); + comp_warn(dev, "no buffer found"); } } @@ -221,7 +221,7 @@ __cold int copier_ipcgtw_create(struct comp_dev *dev, struct copier_data *cd, gtw_cfg = &copier->gtw_cfg; if (!gtw_cfg->config_length) { - comp_err(dev, "ipcgtw_create(): empty ipc4_gateway_config_data"); + comp_err(dev, "empty ipc4_gateway_config_data"); return -EINVAL; } @@ -244,7 +244,7 @@ __cold int copier_ipcgtw_create(struct comp_dev *dev, struct copier_data *cd, /* The buffer connected to the IPC gateway will be resized later in ipcgtw_params() * to the size specified in the IPC gateway blob. */ - comp_dbg(dev, "ipcgtw_create(): buffer_size: %u", blob->buffer_size); + comp_dbg(dev, "buffer_size: %u", blob->buffer_size); ipcgtw_data->buf_size = blob->buffer_size; cd->converter[IPC4_COPIER_GATEWAY_PIN] = diff --git a/src/audio/crossover/crossover.c b/src/audio/crossover/crossover.c index af54bf8245fd..7ae8dd47c6a2 100644 --- a/src/audio/crossover/crossover.c +++ b/src/audio/crossover/crossover.c @@ -321,7 +321,7 @@ static int crossover_init(struct processing_module *mod) /* Handler for configuration data */ cd->model_handler = comp_data_blob_handler_new(dev); if (!cd->model_handler) { - comp_err(dev, "crossover_init(): comp_data_blob_handler_new() failed."); + comp_err(dev, "comp_data_blob_handler_new() failed."); ret = -ENOMEM; goto cd_fail; } @@ -329,13 +329,13 @@ static int crossover_init(struct processing_module *mod) /* Get configuration data and reset Crossover state */ ret = comp_init_data_blob(cd->model_handler, bs, ipc_crossover->data); if (ret < 0) { - comp_err(dev, "crossover_init(): comp_init_data_blob() failed."); + comp_err(dev, "comp_init_data_blob() failed."); goto cd_fail; } ret = crossover_output_pin_init(mod); if (ret < 0) { - comp_err(dev, "crossover_init(): crossover_init_output_pins() failed."); + comp_err(dev, "crossover_init_output_pins() failed."); goto cd_fail; } @@ -552,7 +552,7 @@ static int crossover_prepare(struct processing_module *mod, /* Validate frame format and buffer size of sinks */ comp_dev_for_each_consumer(dev, sink) { if (cd->source_format != audio_stream_get_frm_fmt(&sink->stream)) { - comp_err(dev, "crossover_prepare(): Source fmt %d and sink fmt %d are different.", + comp_err(dev, "Source fmt %d and sink fmt %d are different.", cd->source_format, audio_stream_get_frm_fmt(&sink->stream)); return -EINVAL; } diff --git a/src/audio/dai-legacy.c b/src/audio/dai-legacy.c index febd67cc8b77..7d98985d3a46 100644 --- a/src/audio/dai-legacy.c +++ b/src/audio/dai-legacy.c @@ -154,7 +154,7 @@ int dai_common_new(struct dai_data *dd, struct comp_dev *dev, const struct ipc_c dd->dai = dai_get(dai->type, dai->dai_index, DAI_CREAT); if (!dd->dai) { - comp_cl_err(&comp_dai, "dai_common_new(): dai_get() failed to create DAI."); + comp_cl_err(&comp_dai, "dai_get() failed to create DAI."); return -ENODEV; } dd->dai->dd = dd; @@ -169,7 +169,7 @@ int dai_common_new(struct dai_data *dd, struct comp_dev *dev, const struct ipc_c dd->dma = dma_get(dir, caps, dma_dev, DMA_ACCESS_SHARED); if (!dd->dma) { - comp_cl_err(&comp_dai, "dai_common_new(): dma_get() failed to get shared access to DMA."); + comp_cl_err(&comp_dai, "dma_get() failed to get shared access to DMA."); return -ENODEV; } @@ -263,7 +263,7 @@ int dai_common_get_hw_params(struct dai_data *dd, struct comp_dev *dev, /* fetching hw dai stream params */ ret = dai_get_hw_params(dd->dai, params, dir); if (ret < 0) { - comp_err(dev, "dai_comp_get_hw_params(): dai_get_hw_params failed ret %d", + comp_err(dev, "dai_get_hw_params failed ret %d", ret); return ret; } @@ -298,7 +298,7 @@ static int dai_comp_hw_params(struct comp_dev *dev, /* configure hw dai stream params */ ret = dai_hw_params(dd->dai, params); if (ret < 0) { - comp_err(dev, "dai_comp_hw_params(): dai_hw_params failed ret %d", + comp_err(dev, "dai_hw_params failed ret %d", ret); return ret; } @@ -323,13 +323,13 @@ static int dai_verify_params(struct dai_data *dd, struct comp_dev *dev, * pcm_converter functions. */ if (hw_params.rate && hw_params.rate != params->rate) { - comp_err(dev, "dai_verify_params(): pcm rate parameter %d does not match hardware rate %d", + comp_err(dev, "pcm rate parameter %d does not match hardware rate %d", params->rate, hw_params.rate); return -EINVAL; } if (hw_params.channels && hw_params.channels != params->channels) { - comp_err(dev, "dai_verify_params(): pcm channels parameter %d does not match hardware channels %d", + comp_err(dev, "pcm channels parameter %d does not match hardware channels %d", params->channels, hw_params.channels); return -EINVAL; } @@ -355,7 +355,7 @@ static int dai_playback_params(struct comp_dev *dev, uint32_t period_bytes, dd->process = pcm_get_conversion_function(local_fmt, dma_fmt); if (!dd->process) { - comp_err(dev, "dai_playback_params(): converter function NULL: local fmt %d dma fmt %d\n", + comp_err(dev, "converter function NULL: local fmt %d dma fmt %d\n", local_fmt, dma_fmt); return -EINVAL; } @@ -388,7 +388,7 @@ static int dai_playback_params(struct comp_dev *dev, uint32_t period_bytes, (uintptr_t)(audio_stream_get_addr(&dd->dma_buffer->stream)), fifo); if (err < 0) - comp_err(dev, "dai_playback_params(): dma_sg_alloc() for period_count %d period_bytes %d failed with err = %d", + comp_err(dev, "dma_sg_alloc() for period_count %d period_bytes %d failed with err = %d", period_count, period_bytes, err); } @@ -409,7 +409,7 @@ static int dai_capture_params(struct comp_dev *dev, uint32_t period_bytes, dd->process = pcm_get_conversion_function(dma_fmt, local_fmt); if (!dd->process) { - comp_err(dev, "dai_capture_params(): converter function NULL: local fmt %d dma fmt %d\n", + comp_err(dev, "converter function NULL: local fmt %d dma fmt %d\n", local_fmt, dma_fmt); return -EINVAL; } @@ -453,7 +453,7 @@ static int dai_capture_params(struct comp_dev *dev, uint32_t period_bytes, (uintptr_t)(audio_stream_get_addr(&dd->dma_buffer->stream)), fifo); if (err < 0) - comp_err(dev, "dai_capture_params(): dma_sg_alloc() for period_count %d period_bytes %d failed with err = %d", + comp_err(dev, "dma_sg_alloc() for period_count %d period_bytes %d failed with err = %d", period_count, period_bytes, err); } @@ -481,14 +481,14 @@ int dai_common_params(struct dai_data *dd, struct comp_dev *dev, err = dai_verify_params(dd, dev, params); if (err < 0) { - comp_err(dev, "dai_params(): pcm params verification failed."); + comp_err(dev, "pcm params verification failed."); return -EINVAL; } /* params verification passed, so now configure hw dai stream params */ err = dai_comp_hw_params(dev, params); if (err < 0) { - comp_err(dev, "dai_params(): dai_comp_hw_params failed err %d", err); + comp_err(dev, "dai_comp_hw_params failed err %d", err); return err; } @@ -505,7 +505,7 @@ int dai_common_params(struct dai_data *dd, struct comp_dev *dev, /* can set params on only init state */ if (dev->state != COMP_STATE_READY) { - comp_err(dev, "dai_params(): Component is in state %d, expected COMP_STATE_READY.", + comp_err(dev, "Component is in state %d, expected COMP_STATE_READY.", dev->state); return -EINVAL; } @@ -513,14 +513,14 @@ int dai_common_params(struct dai_data *dd, struct comp_dev *dev, err = dma_get_attribute_legacy(dd->dma, DMA_ATTR_BUFFER_ADDRESS_ALIGNMENT, &addr_align); if (err < 0) { - comp_err(dev, "dai_params(): could not get dma buffer address alignment, err = %d", + comp_err(dev, "could not get dma buffer address alignment, err = %d", err); return err; } err = dma_get_attribute_legacy(dd->dma, DMA_ATTR_BUFFER_ALIGNMENT, &align); if (err < 0 || !align) { - comp_err(dev, "dai_params(): could not get valid dma buffer alignment, err = %d, align = %u", + comp_err(dev, "could not get valid dma buffer alignment, err = %d, align = %u", err, align); return -EINVAL; } @@ -528,7 +528,7 @@ int dai_common_params(struct dai_data *dd, struct comp_dev *dev, err = dma_get_attribute_legacy(dd->dma, DMA_ATTR_BUFFER_PERIOD_COUNT, &period_count); if (err < 0 || !period_count) { - comp_err(dev, "dai_params(): could not get valid dma buffer period count, err = %d, period_count = %u", + comp_err(dev, "could not get valid dma buffer period count, err = %d, period_count = %u", err, period_count); return -EINVAL; } @@ -540,7 +540,7 @@ int dai_common_params(struct dai_data *dd, struct comp_dev *dev, /* calculate period size */ period_bytes = dev->frames * frame_size; if (!period_bytes) { - comp_err(dev, "dai_params(): invalid period_bytes."); + comp_err(dev, "invalid period_bytes."); return -EINVAL; } @@ -556,7 +556,7 @@ int dai_common_params(struct dai_data *dd, struct comp_dev *dev, err = buffer_set_size(dd->dma_buffer, buffer_size, addr_align); if (err < 0) { - comp_err(dev, "dai_params(): buffer_set_size() failed, buffer_size = %u", + comp_err(dev, "buffer_set_size() failed, buffer_size = %u", buffer_size); return err; } @@ -564,7 +564,7 @@ int dai_common_params(struct dai_data *dd, struct comp_dev *dev, dd->dma_buffer = buffer_alloc(buffer_size, SOF_MEM_FLAG_USER | SOF_MEM_FLAG_DMA, addr_align, false); if (!dd->dma_buffer) { - comp_err(dev, "dai_params(): failed to alloc dma buffer"); + comp_err(dev, "failed to alloc dma buffer"); return -ENOMEM; } @@ -599,7 +599,7 @@ int dai_common_config_prepare(struct dai_data *dd, struct comp_dev *dev) /* cannot configure DAI while active */ if (dev->state == COMP_STATE_ACTIVE) { - comp_info(dev, "dai_common_config_prepare(): Component is in active state."); + comp_info(dev, "Component is in active state."); return 0; } @@ -609,7 +609,7 @@ int dai_common_config_prepare(struct dai_data *dd, struct comp_dev *dev) } if (dd->chan) { - comp_info(dev, "dai_common_config_prepare(): dma channel index %d already configured", + comp_info(dev, "dma channel index %d already configured", dd->chan->index); return 0; } @@ -626,14 +626,14 @@ int dai_common_config_prepare(struct dai_data *dd, struct comp_dev *dev) /* allocate DMA channel */ dd->chan = dma_channel_get_legacy(dd->dma, channel); if (!dd->chan) { - comp_err(dev, "dai_common_config_prepare(): dma_channel_get() failed"); + comp_err(dev, "dma_channel_get() failed"); dd->chan = NULL; return -EIO; } dd->chan->dev_data = dd; - comp_info(dev, "dai_common_config_prepare(): new configured dma channel index %d", + comp_info(dev, "new configured dma channel index %d", dd->chan->index); /* setup callback */ @@ -650,13 +650,13 @@ int dai_common_prepare(struct dai_data *dd, struct comp_dev *dev) dd->total_data_processed = 0; if (!dd->chan) { - comp_err(dev, "dai_prepare(): Missing dd->chan."); + comp_err(dev, "Missing dd->chan."); comp_set_state(dev, COMP_TRIGGER_RESET); return -EINVAL; } if (!dd->config.elem_array.elems) { - comp_err(dev, "dai_prepare(): Missing dd->config.elem_array.elems."); + comp_err(dev, "Missing dd->config.elem_array.elems."); comp_set_state(dev, COMP_TRIGGER_RESET); return -EINVAL; } @@ -902,10 +902,10 @@ static void dai_report_xrun(struct comp_dev *dev, uint32_t bytes) struct dai_data *dd = comp_get_drvdata(dev); if (dev->direction == SOF_IPC_STREAM_PLAYBACK) { - comp_err(dev, "dai_report_xrun(): underrun due to no data available"); + comp_err(dev, "underrun due to no data available"); comp_underrun(dev, dd->local_buffer, bytes); } else { - comp_err(dev, "dai_report_xrun(): overrun due to no space available"); + comp_err(dev, "overrun due to no space available"); comp_overrun(dev, dd->local_buffer, bytes); } } @@ -958,16 +958,16 @@ int dai_common_copy(struct dai_data *dd, struct comp_dev *dev, pcm_converter_fun /* Check possibility of glitch occurrence */ if (dev->direction == SOF_IPC_STREAM_PLAYBACK && copy_bytes + avail_bytes < dd->period_bytes) - comp_warn(dev, "dai_common_copy(): Copy_bytes %d + avail bytes %d < period bytes %d, possible glitch", + comp_warn(dev, "Copy_bytes %d + avail bytes %d < period bytes %d, possible glitch", copy_bytes, avail_bytes, dd->period_bytes); else if (dev->direction == SOF_IPC_STREAM_CAPTURE && copy_bytes + free_bytes < dd->period_bytes) - comp_warn(dev, "dai_common_copy(): Copy_bytes %d + free bytes %d < period bytes %d, possible glitch", + comp_warn(dev, "Copy_bytes %d + free bytes %d < period bytes %d, possible glitch", copy_bytes, free_bytes, dd->period_bytes); /* return if nothing to copy */ if (!copy_bytes) { - comp_warn(dev, "dai_common_copy(): nothing to copy"); + comp_warn(dev, "nothing to copy"); return 0; } diff --git a/src/audio/data_blob.c b/src/audio/data_blob.c index a7ff3c7dae33..42d612fb3104 100644 --- a/src/audio/data_blob.c +++ b/src/audio/data_blob.c @@ -72,7 +72,7 @@ void *comp_get_data_blob(struct comp_data_blob_handler *blob_handler, /* Function returns new data blob if available */ if (comp_is_new_data_blob_available(blob_handler)) { - comp_dbg(blob_handler->dev, "comp_get_data_blob(): new data available"); + comp_dbg(blob_handler->dev, "new data available"); /* Free "old" data blob and set data to data_new pointer */ blob_handler->free(blob_handler->data); @@ -95,7 +95,7 @@ void *comp_get_data_blob(struct comp_data_blob_handler *blob_handler, * data blob it means that component hasn't got any config yet. * Function returns NULL in that case. */ - comp_warn(blob_handler->dev, "comp_get_data_blob(): blob_handler->data is not set."); + comp_warn(blob_handler->dev, "blob_handler->data is not set."); } if (size) @@ -145,7 +145,7 @@ int comp_init_data_blob(struct comp_data_blob_handler *blob_handler, /* Data blob allocation */ blob_handler->data = blob_handler->alloc(size); if (!blob_handler->data) { - comp_err(blob_handler->dev, "comp_init_data_blob(): model->data allocation failed"); + comp_err(blob_handler->dev, "model->data allocation failed"); return -ENOMEM; } @@ -243,7 +243,7 @@ int comp_data_blob_set(struct comp_data_blob_handler *blob_handler, if (!blob_handler->data_new) { blob_handler->data_new = blob_handler->alloc(data_offset_size); if (!blob_handler->data_new) { - comp_err(blob_handler->dev, "comp_data_blob_set_cmd(): blob_handler->data_new allocation failed."); + comp_err(blob_handler->dev, "blob_handler->data_new allocation failed."); return -ENOMEM; } } @@ -255,7 +255,7 @@ int comp_data_blob_set(struct comp_data_blob_handler *blob_handler, /* return an error in case when we do not have allocated memory for model data */ if (!blob_handler->data_new) { - comp_err(blob_handler->dev, "comp_data_blob_set_cmd(): buffer not allocated"); + comp_err(blob_handler->dev, "buffer not allocated"); return -ENOMEM; } @@ -263,20 +263,20 @@ int comp_data_blob_set(struct comp_data_blob_handler *blob_handler, blob_handler->new_data_size - blob_handler->data_pos, fragment, fragment_size); if (ret) { - comp_err(blob_handler->dev, "comp_data_blob_set_cmd(): failed to copy fragment"); + comp_err(blob_handler->dev, "failed to copy fragment"); return ret; } blob_handler->data_pos += fragment_size; if (pos == MODULE_CFG_FRAGMENT_SINGLE || pos == MODULE_CFG_FRAGMENT_LAST) { - comp_dbg(blob_handler->dev, "comp_data_blob_set_cmd(): final package received"); + comp_dbg(blob_handler->dev, "final package received"); if (blob_handler->validator) { - comp_dbg(blob_handler->dev, "comp_data_blob_set_cmd(): validating new data..."); + comp_dbg(blob_handler->dev, "validating new data..."); ret = blob_handler->validator(blob_handler->dev, blob_handler->data_new, blob_handler->new_data_size); if (ret < 0) { - comp_err(blob_handler->dev, "comp_data_blob_set_cmd(): new data is invalid! discarding it..."); + comp_err(blob_handler->dev, "new data is invalid! discarding it..."); blob_handler->free(blob_handler->data_new); blob_handler->data_new = NULL; return ret; @@ -327,7 +327,7 @@ int ipc4_comp_data_blob_set(struct comp_data_blob_handler *blob_handler, assert(blob_handler); comp_dbg(blob_handler->dev, - "ipc4_comp_data_blob_set(): data_offset = %d", + "data_offset = %d", data_offset); /* in case when the current package is the first, we should allocate @@ -353,7 +353,7 @@ int ipc4_comp_data_blob_set(struct comp_data_blob_handler *blob_handler, if (!blob_handler->data_new) { comp_err(blob_handler->dev, - "ipc4_comp_data_blob_set(): blob_handler allocation failed!"); + "blob_handler allocation failed!"); return -ENOMEM; } } @@ -375,13 +375,13 @@ int ipc4_comp_data_blob_set(struct comp_data_blob_handler *blob_handler, */ if (!blob_handler->data_new) { comp_err(blob_handler->dev, - "ipc4_comp_data_blob_set(): Buffer not allocated!"); + "Buffer not allocated!"); return -ENOMEM; } if (blob_handler->data_pos != data_offset) { comp_err(blob_handler->dev, - "ipc4_comp_data_blob_set(): Wrong data offset received!"); + "Wrong data offset received!"); return -EINVAL; } @@ -399,7 +399,7 @@ int ipc4_comp_data_blob_set(struct comp_data_blob_handler *blob_handler, if (last_block) { comp_dbg(blob_handler->dev, - "ipc4_comp_data_blob_set(): final package received"); + "final package received"); /* If component state is READY we can omit old * configuration immediately. When in playback/capture @@ -497,7 +497,7 @@ int comp_data_blob_set_cmd(struct comp_data_blob_handler *blob_handler, blob_handler->data_new = blob_handler->alloc(cdata->data->size); if (!blob_handler->data_new) { - comp_err(blob_handler->dev, "comp_data_blob_set_cmd(): blob_handler->data_new allocation failed."); + comp_err(blob_handler->dev, "blob_handler->data_new allocation failed."); return -ENOMEM; } } @@ -511,7 +511,7 @@ int comp_data_blob_set_cmd(struct comp_data_blob_handler *blob_handler, * model data */ if (!blob_handler->data_new) { - comp_err(blob_handler->dev, "comp_data_blob_set_cmd(): buffer not allocated"); + comp_err(blob_handler->dev, "buffer not allocated"); return -ENOMEM; } @@ -523,14 +523,14 @@ int comp_data_blob_set_cmd(struct comp_data_blob_handler *blob_handler, blob_handler->data_pos += cdata->num_elems; if (!cdata->elems_remaining) { - comp_dbg(blob_handler->dev, "comp_data_blob_set_cmd(): final package received"); + comp_dbg(blob_handler->dev, "final package received"); if (blob_handler->validator) { - comp_dbg(blob_handler->dev, "comp_data_blob_set_cmd(): validating new data blob"); + comp_dbg(blob_handler->dev, "validating new data blob"); ret = blob_handler->validator(blob_handler->dev, blob_handler->data_new, blob_handler->new_data_size); if (ret < 0) { - comp_err(blob_handler->dev, "comp_data_blob_set_cmd(): new data blob invalid, discarding"); + comp_err(blob_handler->dev, "new data blob invalid, discarding"); blob_handler->free(blob_handler->data_new); blob_handler->data_new = NULL; return ret; @@ -598,7 +598,7 @@ int comp_data_blob_get_cmd(struct comp_data_blob_handler *blob_handler, * required size */ if (cdata->num_elems > size) { - comp_err(blob_handler->dev, "comp_data_blob_get_cmd(): invalid cdata->num_elems %d", + comp_err(blob_handler->dev, "invalid cdata->num_elems %d", cdata->num_elems); return -EINVAL; } @@ -613,7 +613,7 @@ int comp_data_blob_get_cmd(struct comp_data_blob_handler *blob_handler, cdata->data->size = blob_handler->data_size; blob_handler->data_pos += cdata->num_elems; } else { - comp_warn(blob_handler->dev, "comp_data_blob_get_cmd(): model->data not allocated yet."); + comp_warn(blob_handler->dev, "model->data not allocated yet."); cdata->data->abi = SOF_ABI_VERSION; cdata->data->size = 0; } diff --git a/src/audio/dcblock/dcblock.c b/src/audio/dcblock/dcblock.c index 704faa1fb6e9..1576835d9ee1 100644 --- a/src/audio/dcblock/dcblock.c +++ b/src/audio/dcblock/dcblock.c @@ -99,14 +99,14 @@ static int dcblock_init(struct processing_module *mod) /* component model data handler */ cd->model_handler = comp_data_blob_handler_new(dev); if (!cd->model_handler) { - comp_err(dev, "dcblock_init(): comp_data_blob_handler_new() failed."); + comp_err(dev, "comp_data_blob_handler_new() failed."); ret = -ENOMEM; goto err_cd; } ret = comp_init_data_blob(cd->model_handler, bs, ipc_dcblock->data); if (ret < 0) { - comp_err(dev, "dcblock_init(): comp_init_data_blob() failed with error: %d", ret); + comp_err(dev, "comp_init_data_blob() failed with error: %d", ret); goto err_model_cd; } diff --git a/src/audio/drc/drc.c b/src/audio/drc/drc.c index 3a6e3d32856b..5a6397291eda 100644 --- a/src/audio/drc/drc.c +++ b/src/audio/drc/drc.c @@ -173,7 +173,7 @@ __cold static int drc_init(struct processing_module *mod) /* Handler for configuration data */ cd->model_handler = comp_data_blob_handler_new(dev); if (!cd->model_handler) { - comp_err(dev, "drc_init(): comp_data_blob_handler_new() failed."); + comp_err(dev, "comp_data_blob_handler_new() failed."); ret = -ENOMEM; goto cd_fail; } @@ -181,7 +181,7 @@ __cold static int drc_init(struct processing_module *mod) /* Get configuration data and reset DRC state */ ret = comp_init_data_blob(cd->model_handler, bs, cfg->data); if (ret < 0) { - comp_err(dev, "drc_init(): comp_init_data_blob() failed."); + comp_err(dev, "comp_init_data_blob() failed."); goto cd_fail; } diff --git a/src/audio/eq_fir/eq_fir.c b/src/audio/eq_fir/eq_fir.c index d4767ff522e6..0269c783a331 100644 --- a/src/audio/eq_fir/eq_fir.c +++ b/src/audio/eq_fir/eq_fir.c @@ -99,7 +99,7 @@ static int eq_fir_init_coef(struct comp_dev *dev, struct sof_eq_fir_config *conf nch = cd->nch; } - comp_info(dev, "eq_fir_init_coef(): %u responses, %u channels, stream %d channels", + comp_info(dev, "%u responses, %u channels, stream %d channels", config->number_of_responses, config->channels_in_config, nch); /* Sanity checks */ @@ -259,7 +259,7 @@ static int eq_fir_init(struct processing_module *mod) * blob size is sane. */ if (bs > SOF_EQ_FIR_MAX_SIZE) { - comp_err(dev, "eq_fir_init(): coefficients blob size = %zu > SOF_EQ_FIR_MAX_SIZE", + comp_err(dev, "coefficients blob size = %zu > SOF_EQ_FIR_MAX_SIZE", bs); return -EINVAL; } @@ -276,7 +276,7 @@ static int eq_fir_init(struct processing_module *mod) /* component model data handler */ cd->model_handler = comp_data_blob_handler_new(dev); if (!cd->model_handler) { - comp_err(dev, "eq_fir_init(): comp_data_blob_handler_new() failed."); + comp_err(dev, "comp_data_blob_handler_new() failed."); ret = -ENOMEM; goto err; } @@ -288,7 +288,7 @@ static int eq_fir_init(struct processing_module *mod) */ ret = comp_init_data_blob(cd->model_handler, bs, cfg->init_data); if (ret < 0) { - comp_err(dev, "eq_fir_init(): comp_init_data_blob() failed."); + comp_err(dev, "comp_init_data_blob() failed."); goto err_init; } @@ -439,11 +439,11 @@ static int eq_fir_prepare(struct processing_module *mod, if (cd->config) { ret = eq_fir_setup(dev, cd, channels); if (ret < 0) - comp_err(dev, "eq_fir_prepare(): eq_fir_setup failed."); + comp_err(dev, "eq_fir_setup failed."); else if (cd->fir_delay_size) ret = set_fir_func(mod, frame_fmt); else - comp_dbg(dev, "eq_fir_prepare(): pass-through"); + comp_dbg(dev, "pass-through"); } if (ret < 0) diff --git a/src/audio/eq_fir/eq_fir_ipc4.c b/src/audio/eq_fir/eq_fir_ipc4.c index 9c73466cfb4a..74cda9752f6f 100644 --- a/src/audio/eq_fir/eq_fir_ipc4.c +++ b/src/audio/eq_fir/eq_fir_ipc4.c @@ -24,7 +24,7 @@ int set_fir_func(struct processing_module *mod, enum sof_ipc_frame fmt) struct comp_data *cd = module_get_private_data(mod); unsigned int valid_bit_depth = mod->priv.cfg.base_cfg.audio_fmt.valid_bit_depth; - comp_dbg(mod->dev, "set_fir_func(): valid_bit_depth %d", valid_bit_depth); + comp_dbg(mod->dev, "valid_bit_depth %d", valid_bit_depth); switch (valid_bit_depth) { #if CONFIG_FORMAT_S16LE case IPC4_DEPTH_16BIT: diff --git a/src/audio/eq_iir/eq_iir.c b/src/audio/eq_iir/eq_iir.c index 73ea4c17fd0f..0e7d3a9b541d 100644 --- a/src/audio/eq_iir/eq_iir.c +++ b/src/audio/eq_iir/eq_iir.c @@ -69,7 +69,7 @@ static int eq_iir_init(struct processing_module *mod) /* component model data handler */ cd->model_handler = comp_data_blob_handler_new(dev); if (!cd->model_handler) { - comp_err(dev, "eq_iir_init(): comp_data_blob_handler_new() failed."); + comp_err(dev, "comp_data_blob_handler_new() failed."); ret = -ENOMEM; goto err; } @@ -79,7 +79,7 @@ static int eq_iir_init(struct processing_module *mod) */ ret = comp_init_data_blob(cd->model_handler, bs, cfg->data); if (ret < 0) { - comp_err(dev, "eq_iir_init(): comp_init_data_blob() failed with error: %d", ret); + comp_err(dev, "comp_init_data_blob() failed with error: %d", ret); comp_data_blob_handler_free(cd->model_handler); goto err; } diff --git a/src/audio/eq_iir/eq_iir_generic.c b/src/audio/eq_iir/eq_iir_generic.c index ff3cba8f4e0e..4e7688b85004 100644 --- a/src/audio/eq_iir/eq_iir_generic.c +++ b/src/audio/eq_iir/eq_iir_generic.c @@ -195,7 +195,7 @@ static int eq_iir_init_coef(struct processing_module *mod, int nch) int j; int s; - comp_info(mod->dev, "eq_iir_init_coef(): %u responses, %u channels, stream %d channels", + comp_info(mod->dev, "%u responses, %u channels, stream %d channels", config->number_of_responses, config->channels_in_config, nch); /* Sanity checks */ diff --git a/src/audio/eq_iir/eq_iir_ipc3.c b/src/audio/eq_iir/eq_iir_ipc3.c index 8fe17f932cca..b8c5536f0d32 100644 --- a/src/audio/eq_iir/eq_iir_ipc3.c +++ b/src/audio/eq_iir/eq_iir_ipc3.c @@ -291,7 +291,7 @@ static int eq_iir_verify_params(struct comp_dev *dev, ret = comp_verify_params(dev, buffer_flag, params); if (ret < 0) { - comp_err(dev, "eq_iir_verify_params(): comp_verify_params() failed."); + comp_err(dev, "comp_verify_params() failed."); return ret; } diff --git a/src/audio/eq_iir/eq_iir_ipc4.c b/src/audio/eq_iir/eq_iir_ipc4.c index d5627d04bd8e..ece765d3140b 100644 --- a/src/audio/eq_iir/eq_iir_ipc4.c +++ b/src/audio/eq_iir/eq_iir_ipc4.c @@ -57,7 +57,7 @@ static eq_iir_func eq_iir_find_func(struct processing_module *mod) { unsigned int valid_bit_depth = mod->priv.cfg.base_cfg.audio_fmt.valid_bit_depth; - comp_dbg(mod->dev, "eq_iir_find_func(): valid_bit_depth %d", valid_bit_depth); + comp_dbg(mod->dev, "valid_bit_depth %d", valid_bit_depth); switch (valid_bit_depth) { #if CONFIG_FORMAT_S16LE case IPC4_DEPTH_16BIT: diff --git a/src/audio/google/google_ctc_audio_processing.c b/src/audio/google/google_ctc_audio_processing.c index f3370d043aa1..3e3e12224457 100644 --- a/src/audio/google/google_ctc_audio_processing.c +++ b/src/audio/google/google_ctc_audio_processing.c @@ -267,7 +267,7 @@ static int ctc_init(struct processing_module *mod) /* Create private component data */ cd = rzalloc(SOF_MEM_FLAG_USER, sizeof(*cd)); if (!cd) { - comp_err(dev, "ctc_init(): Failed to create component data"); + comp_err(dev, "Failed to create component data"); ctc_free(mod); return -ENOMEM; } @@ -279,27 +279,27 @@ static int ctc_init(struct processing_module *mod) cd->input = rballoc(SOF_MEM_FLAG_USER, buf_size); if (!cd->input) { - comp_err(dev, "ctc_init(): Failed to allocate input buffer"); + comp_err(dev, "Failed to allocate input buffer"); ctc_free(mod); return -ENOMEM; } cd->output = rballoc(SOF_MEM_FLAG_USER, buf_size); if (!cd->output) { - comp_err(dev, "ctc_init(): Failed to allocate output buffer"); + comp_err(dev, "Failed to allocate output buffer"); ctc_free(mod); return -ENOMEM; } cd->tuning_handler = comp_data_blob_handler_new(dev); if (!cd->tuning_handler) { - comp_err(dev, "ctc_init(): Failed to create tuning handler"); + comp_err(dev, "Failed to create tuning handler"); ctc_free(mod); return -ENOMEM; } cd->enabled = true; - comp_dbg(dev, "ctc_init(): Ready"); + comp_dbg(dev, "Ready"); return 0; } @@ -321,16 +321,16 @@ static int google_ctc_audio_processing_reconfigure(struct processing_module *mod } if (!config) { - comp_err(dev, "google_ctc_audio_processing_reconfigure(): Tuning config not set"); + comp_err(dev, "Tuning config not set"); return -EINVAL; } - comp_info(dev, "google_ctc_audio_processing_reconfigure(): New tuning config %p (%zu bytes)", + comp_info(dev, "New tuning config %p (%zu bytes)", config, size); cd->reconfigure = false; comp_info(dev, - "google_ctc_audio_processing_reconfigure(): Applying config of size %zu bytes", + "Applying config of size %zu bytes", size); ret = GoogleCtcAudioProcessingReconfigure(cd->state, config, size); if (ret) { @@ -391,7 +391,7 @@ static int ctc_prepare(struct processing_module *mod, config = comp_get_data_blob(cd->tuning_handler, &config_size, NULL); if (config_size != CTC_BLOB_CONFIG_SIZE) { - comp_info(mod->dev, "ctc_prepare(): config_size not expected: %d", config_size); + comp_info(mod->dev, "config_size not expected: %d", config_size); config = NULL; config_size = 0; } diff --git a/src/audio/google/google_ctc_audio_processing_ipc3.c b/src/audio/google/google_ctc_audio_processing_ipc3.c index 9f5477607d70..96ce45cb72e2 100644 --- a/src/audio/google/google_ctc_audio_processing_ipc3.c +++ b/src/audio/google/google_ctc_audio_processing_ipc3.c @@ -40,13 +40,13 @@ int ctc_set_config(struct processing_module *mod, uint32_t param_id, config = comp_get_data_blob(cd->tuning_handler, &size, NULL); if (size != CTC_BLOB_CONFIG_SIZE) { comp_err(mod->dev, - "ctc_set_config(): Invalid config size = %d", + "Invalid config size = %d", size); return -EINVAL; } if (config->size != CTC_BLOB_CONFIG_SIZE) { comp_err(mod->dev, - "ctc_set_config(): Invalid config->size = %d", + "Invalid config->size = %d", config->size); return -EINVAL; } @@ -61,12 +61,12 @@ int ctc_set_config(struct processing_module *mod, uint32_t param_id, return 0; } comp_err(mod->dev, - "ctc_set_config(): Illegal num_elems = %d", + "Illegal num_elems = %d", cdata->num_elems); return -EINVAL; default: comp_err(mod->dev, - "ctc_set_config(): Only binary and switch controls supported %d", + "Only binary and switch controls supported %d", cdata->cmd); return -EINVAL; } @@ -79,7 +79,7 @@ int ctc_get_config(struct processing_module *mod, struct sof_ipc_ctrl_data *cdata = (struct sof_ipc_ctrl_data *)fragment; struct google_ctc_audio_processing_comp_data *cd = module_get_private_data(mod); - comp_info(mod->dev, "ctc_get_config(): %u", cdata->cmd); + comp_info(mod->dev, "%u", cdata->cmd); switch (cdata->cmd) { case SOF_CTRL_CMD_BINARY: diff --git a/src/audio/google/google_ctc_audio_processing_ipc4.c b/src/audio/google/google_ctc_audio_processing_ipc4.c index b57de9766d82..fa5f265e9d0f 100644 --- a/src/audio/google/google_ctc_audio_processing_ipc4.c +++ b/src/audio/google/google_ctc_audio_processing_ipc4.c @@ -37,15 +37,15 @@ int ctc_set_config(struct processing_module *mod, uint32_t param_id, case SOF_IPC4_SWITCH_CONTROL_PARAM_ID: if (ctl->id == 0 && ctl->num_elems == 1) { cd->enabled = ctl->chanv[0].value; - comp_info(mod->dev, "ctc_set_config(): enabled = %d", cd->enabled); + comp_info(mod->dev, "enabled = %d", cd->enabled); return 0; } - comp_err(mod->dev, "ctc_set_config(): Illegal control id = %d, num_elems = %d", + comp_err(mod->dev, "Illegal control id = %d, num_elems = %d", ctl->id, ctl->num_elems); return -EINVAL; case SOF_IPC4_ENUM_CONTROL_PARAM_ID: default: - comp_err(mod->dev, "ctc_set_config(): Only binary and switch controls supported"); + comp_err(mod->dev, "Only binary and switch controls supported"); return -EINVAL; } @@ -58,13 +58,13 @@ int ctc_set_config(struct processing_module *mod, uint32_t param_id, config = comp_get_data_blob(cd->tuning_handler, &size, NULL); if (size != CTC_BLOB_CONFIG_SIZE) { comp_err(mod->dev, - "ctc_set_config(): Invalid config size = %d", + "Invalid config size = %d", size); return -EINVAL; } if (config->size != CTC_BLOB_CONFIG_SIZE) { comp_err(mod->dev, - "ctc_set_config(): Invalid config->size = %d", + "Invalid config->size = %d", config->size); return -EINVAL; } @@ -81,7 +81,7 @@ int ctc_get_config(struct processing_module *mod, struct sof_ipc_ctrl_data *cdata = (struct sof_ipc_ctrl_data *)fragment; struct google_ctc_audio_processing_comp_data *cd = module_get_private_data(mod); - comp_info(mod->dev, "ctc_get_config(): %u", cdata->cmd); + comp_info(mod->dev, "%u", cdata->cmd); return comp_data_blob_get_cmd(cd->tuning_handler, cdata, fragment_size); } diff --git a/src/audio/google/google_hotword_detect.c b/src/audio/google/google_hotword_detect.c index 61d498ef9467..e625aba57d93 100644 --- a/src/audio/google/google_hotword_detect.c +++ b/src/audio/google/google_hotword_detect.c @@ -115,19 +115,19 @@ static struct comp_dev *ghd_create(const struct comp_driver *drv, cd->msg = ipc_msg_init(cd->event.rhdr.hdr.cmd, cd->event.rhdr.hdr.size); if (!cd->msg) { - comp_err(dev, "ghd_create(): ipc_msg_init failed"); + comp_err(dev, "ipc_msg_init failed"); goto cd_fail; } /* Create component model data handler */ cd->model_handler = comp_data_blob_handler_new(dev); if (!cd->model_handler) { - comp_err(dev, "ghd_create(): comp_data_blob_handler_new failed"); + comp_err(dev, "comp_data_blob_handler_new failed"); goto cd_fail; } dev->state = COMP_STATE_READY; - comp_dbg(dev, "ghd_create(): Ready"); + comp_dbg(dev, "Ready"); return dev; cd_fail: @@ -164,7 +164,7 @@ static int ghd_params(struct comp_dev *dev, ret = comp_verify_params(dev, 0, params); if (ret < 0) { - comp_err(dev, "ghd_params(): comp_verify_params failed."); + comp_err(dev, "comp_verify_params failed."); return -EINVAL; } @@ -172,13 +172,13 @@ static int ghd_params(struct comp_dev *dev, sourceb = comp_dev_get_first_data_producer(dev); if (audio_stream_get_channels(sourceb->stream) != 1) { - comp_err(dev, "ghd_params(): Only single-channel supported"); + comp_err(dev, "Only single-channel supported"); ret = -EINVAL; } else if (audio_stream_get_frm_fmt(&sourceb->stream) != SOF_IPC_FRAME_S16_LE) { - comp_err(dev, "ghd_params(): Only S16_LE supported"); + comp_err(dev, "Only S16_LE supported"); ret = -EINVAL; } else if (sourceb->stream.rate != KPB_SAMPLNG_FREQUENCY) { - comp_err(dev, "ghd_params(): Only 16KHz supported"); + comp_err(dev, "Only 16KHz supported"); ret = -EINVAL; } @@ -229,11 +229,11 @@ static int ghd_ctrl_set_bin_data(struct comp_dev *dev, switch (cdata->data->type) { case GOOGLE_HOTWORD_DETECT_MODEL: ret = comp_data_blob_set_cmd(cd->model_handler, cdata); - comp_dbg(dev, "ghd_ctrl_set_bin_data(): comp_data_blob_set_cmd=%d", + comp_dbg(dev, "comp_data_blob_set_cmd=%d", ret); return ret; default: - comp_err(dev, "ghd_ctrl_set_bin_data(): Unknown cdata->data->type %d", + comp_err(dev, "Unknown cdata->data->type %d", cdata->data->type); return -EINVAL; } @@ -246,7 +246,7 @@ static int ghd_ctrl_set_data(struct comp_dev *dev, case SOF_CTRL_CMD_BINARY: return ghd_ctrl_set_bin_data(dev, cdata); default: - comp_err(dev, "ghd_ctrl_set_data(): Only binary controls supported %d", + comp_err(dev, "Only binary controls supported %d", cdata->cmd); return -EINVAL; } @@ -264,11 +264,11 @@ static int ghd_ctrl_get_bin_data(struct comp_dev *dev, ret = comp_data_blob_get_cmd(cd->model_handler, cdata, max_data_size); - comp_dbg(dev, "ghd_ctrl_get_bin_data(): comp_data_blob_get_cmd=%d, size=%d", + comp_dbg(dev, "comp_data_blob_get_cmd=%d, size=%d", ret, max_data_size); return ret; default: - comp_err(dev, "ghd_ctrl_get_bin_data(): Unknown cdata->data->type %d", + comp_err(dev, "Unknown cdata->data->type %d", cdata->data->type); return -EINVAL; } @@ -282,7 +282,7 @@ static int ghd_ctrl_get_data(struct comp_dev *dev, case SOF_CTRL_CMD_BINARY: return ghd_ctrl_get_bin_data(dev, cdata, max_data_size); default: - comp_err(dev, "ghd_ctrl_get_data(): Only binary controls supported %d", + comp_err(dev, "Only binary controls supported %d", cdata->cmd); return -EINVAL; } @@ -293,7 +293,7 @@ static int ghd_cmd(struct comp_dev *dev, int cmd, void *data, { struct sof_ipc_ctrl_data *cdata = data; - comp_dbg(dev, "ghd_cmd(): %d", cmd); + comp_dbg(dev, "%d", cmd); switch (cmd) { case COMP_CMD_SET_DATA: @@ -301,7 +301,7 @@ static int ghd_cmd(struct comp_dev *dev, int cmd, void *data, case COMP_CMD_GET_DATA: return ghd_ctrl_get_data(dev, cdata, max_data_size); default: - comp_err(dev, "ghd_cmd(): Unknown cmd %d", cmd); + comp_err(dev, "Unknown cmd %d", cmd); return -EINVAL; } } @@ -311,7 +311,7 @@ static int ghd_trigger(struct comp_dev *dev, int cmd) { struct comp_data *cd = comp_get_drvdata(dev); - comp_dbg(dev, "ghd_trigger(): %d", cmd); + comp_dbg(dev, "%d", cmd); if (cmd == COMP_TRIGGER_START || cmd == COMP_TRIGGER_RELEASE) { cd->detected = 0; @@ -382,7 +382,7 @@ static int ghd_copy(struct comp_dev *dev) /* Check for new model */ if (comp_is_new_data_blob_available(cd->model_handler)) { - comp_dbg(dev, "ghd_copy(): Switch to new model"); + comp_dbg(dev, "Switch to new model"); ret = ghd_setup_model(dev); if (ret) return ret; diff --git a/src/audio/google/google_rtc_audio_processing.c b/src/audio/google/google_rtc_audio_processing.c index 330ce36e4101..f98b2de7322c 100644 --- a/src/audio/google/google_rtc_audio_processing.c +++ b/src/audio/google/google_rtc_audio_processing.c @@ -269,11 +269,11 @@ static int google_rtc_audio_processing_reconfigure(struct processing_module *mod } if (!config) { - comp_err(dev, "google_rtc_audio_processing_reconfigure(): Tuning config not set"); + comp_err(dev, "Tuning config not set"); return -EINVAL; } - comp_info(dev, "google_rtc_audio_processing_reconfigure(): New tuning config %p (%zu bytes)", + comp_info(dev, "New tuning config %p (%zu bytes)", config, size); cd->reconfigure = false; @@ -305,7 +305,7 @@ static int google_rtc_audio_processing_reconfigure(struct processing_module *mod if (google_rtc_audio_processing_config_present) { comp_info(dev, - "google_rtc_audio_processing_reconfigure(): Applying config of size %zu bytes", + "Applying config of size %zu bytes", google_rtc_audio_processing_config_size); ret = GoogleRtcAudioProcessingReconfigure(cd->state, @@ -331,7 +331,7 @@ static int google_rtc_audio_processing_reconfigure(struct processing_module *mod cd->num_capture_channels = num_capture_output_channels; } comp_info(dev, - "google_rtc_audio_processing_reconfigure(): Applying num capture channels %d", + "Applying num capture channels %d", cd->num_capture_channels); @@ -358,7 +358,7 @@ static int google_rtc_audio_processing_reconfigure(struct processing_module *mod /* Logging of linear headroom, using integer workaround to the broken printout of floats */ comp_info(dev, - "google_rtc_audio_processing_reconfigure(): Applying capture linear headroom: %d.%d", + "Applying capture linear headroom: %d.%d", (int)mic_gain, (int)(100 * mic_gain) - 100 * ((int)mic_gain)); } if (aec_reference_delay_present) { @@ -366,7 +366,7 @@ static int google_rtc_audio_processing_reconfigure(struct processing_module *mod /* Logging of delay, using integer workaround to the broken printout of floats */ comp_info(dev, - "google_rtc_audio_processing_reconfigure(): Applying aec reference delay: %d.%d", + "Applying aec reference delay: %d.%d", (int)aec_reference_delay, (int)(100 * aec_reference_delay) - 100 * ((int)aec_reference_delay)); @@ -414,7 +414,7 @@ static int google_rtc_audio_processing_cmd_set_data(struct processing_module *mo return 0; default: comp_err(mod->dev, - "google_rtc_audio_processing_ctrl_set_data(): Only binary controls supported %d", + "Only binary controls supported %d", cdata->cmd); return -EINVAL; } @@ -426,14 +426,14 @@ static int google_rtc_audio_processing_cmd_get_data(struct processing_module *mo { struct google_rtc_audio_processing_comp_data *cd = module_get_private_data(mod); - comp_info(mod->dev, "google_rtc_audio_processing_ctrl_get_data(): %u", cdata->cmd); + comp_info(mod->dev, "%u", cdata->cmd); switch (cdata->cmd) { case SOF_CTRL_CMD_BINARY: return comp_data_blob_get_cmd(cd->tuning_handler, cdata, max_data_size); default: comp_err(mod->dev, - "google_rtc_audio_processing_ctrl_get_data(): Only binary controls supported %d", + "Only binary controls supported %d", cdata->cmd); return -EINVAL; } @@ -454,7 +454,7 @@ static int google_rtc_audio_processing_set_config(struct processing_module *mod, switch (param_id) { case SOF_IPC4_SWITCH_CONTROL_PARAM_ID: case SOF_IPC4_ENUM_CONTROL_PARAM_ID: - comp_err(mod->dev, "google_rtc_audio_processing_ctrl_set_data(): Only binary controls supported"); + comp_err(mod->dev, "Only binary controls supported"); return -EINVAL; } @@ -493,7 +493,7 @@ static int google_rtc_audio_processing_get_config(struct processing_module *mod, uint8_t *fragment, size_t fragment_size) { #if CONFIG_IPC_MAJOR_4 - comp_err(mod->dev, "google_rtc_audio_processing_ctrl_get_config(): Not supported"); + comp_err(mod->dev, "Not supported"); return -EINVAL; #elif CONFIG_IPC_MAJOR_3 struct sof_ipc_ctrl_data *cdata = (struct sof_ipc_ctrl_data *)fragment; @@ -575,11 +575,11 @@ static int google_rtc_audio_processing_init(struct processing_module *mod) /* Mic and reference, needed for audio stream type copy module client */ mod->max_sources = 2; - comp_dbg(dev, "google_rtc_audio_processing_init(): Ready"); + comp_dbg(dev, "Ready"); return 0; fail: - comp_err(dev, "google_rtc_audio_processing_init(): Failed"); + comp_err(dev, "Failed"); if (cd) { if (cd->state) { GoogleRtcAudioProcessingFree(cd->state); diff --git a/src/audio/host-legacy.c b/src/audio/host-legacy.c index c172b60bec3b..192686da3fdd 100644 --- a/src/audio/host-legacy.c +++ b/src/audio/host-legacy.c @@ -81,14 +81,14 @@ static int host_dma_set_config_and_copy(struct host_data *hd, struct comp_dev *d /* reconfigure transfer */ ret = dma_set_config_legacy(hd->chan, &hd->config); if (ret < 0) { - comp_err(dev, "host_dma_set_config_and_copy(): dma_set_config() failed, ret = %d", + comp_err(dev, "dma_set_config() failed, ret = %d", ret); return ret; } ret = dma_copy_legacy(hd->chan, bytes, DMA_COPY_ONE_SHOT | DMA_COPY_BLOCKING); if (ret < 0) { - comp_err(dev, "host_dma_set_config_and_copy(): dma_copy() failed, ret = %d", + comp_err(dev, "dma_copy() failed, ret = %d", ret); return ret; } @@ -133,7 +133,7 @@ static int host_copy_one_shot(struct host_data *hd, struct comp_dev *dev, copy_c copy_bytes = host_get_copy_bytes_one_shot(hd, dev); if (!copy_bytes) { - comp_info(dev, "host_copy_one_shot(): no bytes to copy"); + comp_info(dev, "no bytes to copy"); return ret; } @@ -201,20 +201,20 @@ static int host_copy_one_shot(struct host_data *hd, struct comp_dev *dev, copy_c copy_bytes = host_get_copy_bytes_one_shot(hd, dev); if (!copy_bytes) { - comp_info(dev, "host_copy_one_shot(): no bytes to copy"); + comp_info(dev, "no bytes to copy"); return ret; } /* reconfigure transfer */ ret = dma_set_config_legacy(hd->chan, &hd->config); if (ret < 0) { - comp_err(dev, "host_copy_one_shot(): dma_set_config() failed, ret = %u", ret); + comp_err(dev, "dma_set_config() failed, ret = %u", ret); return ret; } ret = dma_copy_legacy(hd->chan, copy_bytes, DMA_COPY_ONE_SHOT); if (ret < 0) { - comp_err(dev, "host_copy_one_shot(): dma_copy() failed, ret = %u", ret); + comp_err(dev, "dma_copy() failed, ret = %u", ret); return ret; } @@ -369,7 +369,7 @@ static uint32_t host_get_copy_bytes_normal(struct host_data *hd, struct comp_dev /* get data sizes from DMA */ ret = dma_get_data_size_legacy(hd->chan, &avail_bytes, &free_bytes); if (ret < 0) { - comp_err(dev, "host_get_copy_bytes_normal(): dma_get_data_size() failed, ret = %u", + comp_err(dev, "dma_get_data_size() failed, ret = %u", ret); /* return 0 copy_bytes in case of error to skip DMA copy */ return 0; @@ -422,7 +422,7 @@ static int host_copy_normal(struct host_data *hd, struct comp_dev *dev, copy_cal ret = dma_copy_legacy(hd->chan, copy_bytes, flags); if (ret < 0) - comp_err(dev, "host_copy_normal(): dma_copy() failed, ret = %u", ret); + comp_err(dev, "dma_copy() failed, ret = %u", ret); return ret; } @@ -445,7 +445,7 @@ static int create_local_elems(struct host_data *hd, struct comp_dev *dev, uint32 err = dma_sg_alloc(&hd->config.elem_array, SOF_MEM_FLAG_USER, dir, 1, 0, 0, 0); if (err < 0) { - comp_err(dev, "create_local_elems(): dma_sg_alloc() failed"); + comp_err(dev, "dma_sg_alloc() failed"); return err; } } else { @@ -456,7 +456,7 @@ static int create_local_elems(struct host_data *hd, struct comp_dev *dev, uint32 buffer_bytes, (uintptr_t)(audio_stream_get_addr(&hd->dma_buffer->stream)), 0); if (err < 0) { - comp_err(dev, "create_local_elems(): dma_sg_alloc() failed"); + comp_err(dev, "dma_sg_alloc() failed"); return err; } @@ -484,7 +484,7 @@ int host_common_trigger(struct host_data *hd, struct comp_dev *dev, int cmd) return 0; if (!hd->chan) { - comp_err(dev, "host_trigger(): no dma channel configured"); + comp_err(dev, "no dma channel configured"); return -EINVAL; } @@ -492,14 +492,14 @@ int host_common_trigger(struct host_data *hd, struct comp_dev *dev, int cmd) case COMP_TRIGGER_START: ret = dma_start_legacy(hd->chan); if (ret < 0) - comp_err(dev, "host_trigger(): dma_start() failed, ret = %u", + comp_err(dev, "dma_start() failed, ret = %u", ret); break; case COMP_TRIGGER_STOP: case COMP_TRIGGER_XRUN: ret = dma_stop_legacy(hd->chan); if (ret < 0) - comp_err(dev, "host_trigger(): dma stop failed: %d", + comp_err(dev, "dma stop failed: %d", ret); break; default: @@ -539,7 +539,7 @@ int host_common_new(struct host_data *hd, struct comp_dev *dev, hd->dma = dma_get(dir, 0, DMA_DEV_HOST, DMA_ACCESS_SHARED); if (!hd->dma) { - comp_err(dev, "host_common_new(): dma_get() returned NULL"); + comp_err(dev, "dma_get() returned NULL"); return -ENODEV; } @@ -552,7 +552,7 @@ int host_common_new(struct host_data *hd, struct comp_dev *dev, hd->msg = ipc_msg_init(hd->posn.rhdr.hdr.cmd, hd->posn.rhdr.hdr.size); if (!hd->msg) { - comp_err(dev, "host_common_new(): ipc_msg_init failed"); + comp_err(dev, "ipc_msg_init failed"); dma_put(hd->dma); return -ENOMEM; } @@ -659,7 +659,7 @@ static int host_verify_params(struct comp_dev *dev, ret = comp_verify_params(dev, 0, params); if (ret < 0) { - comp_err(dev, "host_verify_params(): comp_verify_params() failed"); + comp_err(dev, "comp_verify_params() failed"); return ret; } @@ -689,7 +689,7 @@ int host_common_params(struct host_data *hd, struct comp_dev *dev, err = dma_get_attribute_legacy(hd->dma, DMA_ATTR_BUFFER_ADDRESS_ALIGNMENT, &addr_align); if (err < 0) { - comp_err(dev, "host_params(): could not get dma buffer address alignment, err = %d", + comp_err(dev, "could not get dma buffer address alignment, err = %d", err); return err; } @@ -697,7 +697,7 @@ int host_common_params(struct host_data *hd, struct comp_dev *dev, /* retrieve DMA buffer size alignment */ err = dma_get_attribute_legacy(hd->dma, DMA_ATTR_BUFFER_ALIGNMENT, &align); if (err < 0 || !align) { - comp_err(dev, "host_params(): could not get valid dma buffer alignment, err = %d, align = %u", + comp_err(dev, "could not get valid dma buffer alignment, err = %d, align = %u", err, align); return -EINVAL; } @@ -706,7 +706,7 @@ int host_common_params(struct host_data *hd, struct comp_dev *dev, err = dma_get_attribute_legacy(hd->dma, DMA_ATTR_BUFFER_PERIOD_COUNT, &period_count); if (err < 0 || !period_count) { - comp_err(dev, "host_params(): could not get valid dma buffer period count, err = %d, period_count = %u", + comp_err(dev, "could not get valid dma buffer period count, err = %d, period_count = %u", err, period_count); return -EINVAL; } @@ -720,7 +720,7 @@ int host_common_params(struct host_data *hd, struct comp_dev *dev, audio_stream_frame_bytes(&hd->local_buffer->stream); if (!period_bytes) { - comp_err(dev, "host_params(): invalid period_bytes"); + comp_err(dev, "invalid period_bytes"); err = -EINVAL; goto out; } @@ -754,7 +754,7 @@ int host_common_params(struct host_data *hd, struct comp_dev *dev, if (hd->dma_buffer) { err = buffer_set_size(hd->dma_buffer, buffer_size, addr_align); if (err < 0) { - comp_err(dev, "host_params(): buffer_set_size() failed, buffer_size = %u", + comp_err(dev, "buffer_set_size() failed, buffer_size = %u", buffer_size); goto out; } @@ -762,7 +762,7 @@ int host_common_params(struct host_data *hd, struct comp_dev *dev, hd->dma_buffer = buffer_alloc(buffer_size, SOF_MEM_FLAG_USER | SOF_MEM_FLAG_DMA, addr_align, false); if (!hd->dma_buffer) { - comp_err(dev, "host_params(): failed to alloc dma buffer"); + comp_err(dev, "failed to alloc dma buffer"); err = -ENOMEM; goto out; } @@ -791,14 +791,14 @@ int host_common_params(struct host_data *hd, struct comp_dev *dev, */ hd->chan = dma_channel_get_legacy(hd->dma, hd->stream_tag); if (!hd->chan) { - comp_err(dev, "host_params(): hd->chan is NULL"); + comp_err(dev, "hd->chan is NULL"); err = -ENODEV; goto out; } err = dma_set_config_legacy(hd->chan, &hd->config); if (err < 0) { - comp_err(dev, "host_params(): dma_set_config() failed"); + comp_err(dev, "dma_set_config() failed"); dma_channel_put_legacy(hd->chan); hd->chan = NULL; goto out; @@ -808,7 +808,7 @@ int host_common_params(struct host_data *hd, struct comp_dev *dev, &hd->dma_copy_align); if (err < 0) { - comp_err(dev, "host_params(): dma_get_attribute()"); + comp_err(dev, "dma_get_attribute()"); goto out; } @@ -847,7 +847,7 @@ static int host_params(struct comp_dev *dev, err = host_verify_params(dev, params); if (err < 0) { - comp_err(dev, "host_params(): pcm params verification failed."); + comp_err(dev, "pcm params verification failed."); return err; } diff --git a/src/audio/igo_nr/igo_nr.c b/src/audio/igo_nr/igo_nr.c index d3edc28a8027..5ab5424cdff3 100644 --- a/src/audio/igo_nr/igo_nr.c +++ b/src/audio/igo_nr/igo_nr.c @@ -428,14 +428,14 @@ static int igo_nr_init(struct processing_module *mod) md->private = cd; ret = IgoLibGetInfo(&cd->igo_lib_info); if (ret != IGO_RET_OK) { - comp_err(dev, "igo_nr_init(): IgoLibGetInfo() Failed."); + comp_err(dev, "IgoLibGetInfo() Failed."); ret = -EINVAL; goto cd_fail; } cd->p_handle = rballoc(SOF_MEM_FLAG_USER, cd->igo_lib_info.handle_size); if (!cd->p_handle) { - comp_err(dev, "igo_nr_init(): igo_handle memory rballoc error for size %d", + comp_err(dev, "igo_handle memory rballoc error for size %d", cd->igo_lib_info.handle_size); ret = -ENOMEM; goto cd_fail; @@ -444,7 +444,7 @@ static int igo_nr_init(struct processing_module *mod) /* Handler for configuration data */ cd->model_handler = comp_data_blob_handler_new(dev); if (!cd->model_handler) { - comp_err(dev, "igo_nr_init(): comp_data_blob_handler_new() failed."); + comp_err(dev, "comp_data_blob_handler_new() failed."); ret = -ENOMEM; goto cd_fail2; } @@ -452,7 +452,7 @@ static int igo_nr_init(struct processing_module *mod) /* Get configuration data */ ret = comp_init_data_blob(cd->model_handler, bs, cfg->data); if (ret < 0) { - comp_err(dev, "igo_nr_init(): comp_init_data_blob() failed."); + comp_err(dev, "comp_init_data_blob() failed."); ret = -ENOMEM; goto cd_fail3; } diff --git a/src/audio/mfcc/mfcc.c b/src/audio/mfcc/mfcc.c index b7a6a99c13b8..6437c187e29e 100644 --- a/src/audio/mfcc/mfcc.c +++ b/src/audio/mfcc/mfcc.c @@ -96,7 +96,7 @@ static int mfcc_init(struct processing_module *mod) md->private = cd; cd->model_handler = comp_data_blob_handler_new(dev); if (!cd->model_handler) { - comp_err(dev, "mfcc_init(): comp_data_blob_handler_new() failed."); + comp_err(dev, "comp_data_blob_handler_new() failed."); ret = -ENOMEM; goto err; } @@ -104,7 +104,7 @@ static int mfcc_init(struct processing_module *mod) /* Get configuration data */ ret = comp_init_data_blob(cd->model_handler, bs, cfg->init_data); if (ret < 0) { - comp_err(mod->dev, "mfcc_init(): comp_init_data_blob() failed."); + comp_err(mod->dev, "comp_init_data_blob() failed."); goto err_init; } @@ -207,7 +207,7 @@ static int mfcc_prepare(struct processing_module *mod, comp_info(dev, "mfcc_prepare(), source_format = %d, sink_format = %d", source_format, sink_format); if (audio_stream_get_size(&sinkb->stream) < sink_period_bytes) { - comp_err(dev, "mfcc_prepare(): sink buffer size %d is insufficient < %d", + comp_err(dev, "sink buffer size %d is insufficient < %d", audio_stream_get_size(&sinkb->stream), sink_period_bytes); ret = -ENOMEM; goto err; diff --git a/src/audio/mfcc/mfcc_setup.c b/src/audio/mfcc/mfcc_setup.c index fa93da29350f..802ea058bb6f 100644 --- a/src/audio/mfcc/mfcc_setup.c +++ b/src/audio/mfcc/mfcc_setup.c @@ -112,19 +112,19 @@ int mfcc_setup(struct processing_module *mod, int max_frames, int sample_rate, i /* Check size */ if (config->size != sizeof(struct sof_mfcc_config)) { - comp_err(dev, "mfcc_setup(): Illegal configuration size %d.", config->size); + comp_err(dev, "Illegal configuration size %d.", config->size); return -EINVAL; } /* Check currently hard-coded features to match configuration request */ if (!config->round_to_power_of_two || !config->snip_edges || config->subtract_mean || config->use_energy) { - comp_err(dev, "mfcc_setup(): Can't change currently hard-coded features"); + comp_err(dev, "Can't change currently hard-coded features"); return -EINVAL; } if (config->sample_frequency != sample_rate) { - comp_err(dev, "mfcc_setup(): Config sample_frequency does not match stream"); + comp_err(dev, "Config sample_frequency does not match stream"); return -EINVAL; } @@ -133,14 +133,14 @@ int mfcc_setup(struct processing_module *mod, int max_frames, int sample_rate, i state->low_freq = config->low_freq; state->high_freq = (config->high_freq == 0) ? (sample_rate >> 1) : config->high_freq; if (state->low_freq > state->high_freq) { - comp_err(dev, "mfcc_setup(): Config high_freq must be larger than low_freq"); + comp_err(dev, "Config high_freq must be larger than low_freq"); return -EINVAL; } comp_info(dev, "mfcc_setup(), source_channel = %d, stream_channels = %d", config->channel, channels); if (config->channel >= channels) { - comp_err(dev, "mfcc_setup(): Illegal channel"); + comp_err(dev, "Illegal channel"); return -EINVAL; } @@ -174,7 +174,7 @@ int mfcc_setup(struct processing_module *mod, int max_frames, int sample_rate, i state->buffers = rzalloc(SOF_MEM_FLAG_USER, state->sample_buffers_size); if (!state->buffers) { - comp_err(dev, "mfcc_setup(): Failed buffer allocate"); + comp_err(dev, "Failed buffer allocate"); ret = -ENOMEM; goto exit; } @@ -191,14 +191,14 @@ int mfcc_setup(struct processing_module *mod, int max_frames, int sample_rate, i #endif fft->fft_buf = rzalloc(SOF_MEM_FLAG_USER, fft->fft_buffer_size); if (!fft->fft_buf) { - comp_err(dev, "mfcc_setup(): Failed FFT buffer allocate"); + comp_err(dev, "Failed FFT buffer allocate"); ret = -ENOMEM; goto free_buffers; } fft->fft_out = rzalloc(SOF_MEM_FLAG_USER, fft->fft_buffer_size); if (!fft->fft_out) { - comp_err(dev, "mfcc_setup(): Failed FFT output allocate"); + comp_err(dev, "Failed FFT output allocate"); ret = -ENOMEM; goto free_fft_buf; } @@ -209,7 +209,7 @@ int mfcc_setup(struct processing_module *mod, int max_frames, int sample_rate, i fft->fft_plan = fft_plan_new(fft->fft_buf, fft->fft_out, fft->fft_padded_size, MFCC_FFT_BITS); if (!fft->fft_plan) { - comp_err(dev, "mfcc_setup(): Failed FFT init"); + comp_err(dev, "Failed FFT init"); ret = -EINVAL; goto free_fft_out; } @@ -222,7 +222,7 @@ int mfcc_setup(struct processing_module *mod, int max_frames, int sample_rate, i /* Setup window */ ret = mfcc_get_window(state, config->window); if (ret < 0) { - comp_err(dev, "mfcc_setup(): Failed Window function"); + comp_err(dev, "Failed Window function"); goto free_fft_out; } @@ -244,7 +244,7 @@ int mfcc_setup(struct processing_module *mod, int max_frames, int sample_rate, i fb->scratch_length2 = fft->fft_buffer_size / sizeof(int16_t); ret = psy_get_mel_filterbank(fb); if (ret < 0) { - comp_err(dev, "mfcc_setup(): Failed Mel filterbank"); + comp_err(dev, "Failed Mel filterbank"); goto free_fft_out; } @@ -255,7 +255,7 @@ int mfcc_setup(struct processing_module *mod, int max_frames, int sample_rate, i dct->ortho = true; ret = dct_initialize_16(dct); if (ret < 0) { - comp_err(dev, "mfcc_setup(): Failed DCT init"); + comp_err(dev, "Failed DCT init"); goto free_melfb_data; } @@ -263,7 +263,7 @@ int mfcc_setup(struct processing_module *mod, int max_frames, int sample_rate, i state->lifter.cepstral_lifter = config->cepstral_lifter; /* Q7.9 max 64.0*/ ret = mfcc_get_cepstral_lifter(&state->lifter); if (ret < 0) { - comp_err(dev, "mfcc_setup(): Failed cepstral lifter"); + comp_err(dev, "Failed cepstral lifter"); goto free_dct_matrix; } diff --git a/src/audio/mixin_mixout/mixin_mixout.c b/src/audio/mixin_mixout/mixin_mixout.c index 92f887ee0979..650d790dff7b 100644 --- a/src/audio/mixin_mixout/mixin_mixout.c +++ b/src/audio/mixin_mixout/mixin_mixout.c @@ -306,7 +306,7 @@ static int mixin_process(struct processing_module *mod, sinks_free_frames = INT32_MAX; if (num_of_sinks > MIXIN_MAX_SINKS) { - comp_err(dev, "mixin_process(): Invalid output sink count %d", + comp_err(dev, "Invalid output sink count %d", num_of_sinks); return -EINVAL; } @@ -673,7 +673,7 @@ static int mixin_params(struct processing_module *mod) ret = comp_verify_params(dev, 0, params); if (ret < 0) { - comp_err(dev, "mixin_params(): comp_verify_params() failed!"); + comp_err(dev, "comp_verify_params() failed!"); return -EINVAL; } @@ -738,7 +738,7 @@ static int mixout_params(struct processing_module *mod) ret = comp_verify_params(dev, 0, params); if (ret < 0) { - comp_err(dev, "mixout_params(): comp_verify_params() failed!"); + comp_err(dev, "comp_verify_params() failed!"); return -EINVAL; } @@ -910,14 +910,14 @@ static int mixin_set_config(struct processing_module *mod, uint32_t config_id, if (sizeof(struct ipc4_mixer_mode_config) + (cfg->mixer_mode_config_count - 1) * sizeof(struct ipc4_mixer_mode_sink_config) > data_offset_size) { - comp_err(dev, "mixin_set_config(): unexpected data size: %u", data_offset_size); + comp_err(dev, "unexpected data size: %u", data_offset_size); return -EINVAL; } for (i = 0; i < cfg->mixer_mode_config_count; i++) { sink_index = cfg->mixer_mode_sink_configs[i].output_queue_id; if (sink_index >= MIXIN_MAX_SINKS) { - comp_err(dev, "mixin_set_config(): invalid sink index: %u", sink_index); + comp_err(dev, "invalid sink index: %u", sink_index); return -EINVAL; } @@ -926,7 +926,7 @@ static int mixin_set_config(struct processing_module *mod, uint32_t config_id, gain = IPC4_MIXIN_UNITY_GAIN; mixin_data->sink_config[sink_index].gain = gain; - comp_dbg(dev, "mixin_set_config(): gain 0x%x will be applied for sink %u", + comp_dbg(dev, "gain 0x%x will be applied for sink %u", gain, sink_index); if (cfg->mixer_mode_sink_configs[i].mixer_mode == @@ -934,7 +934,7 @@ static int mixin_set_config(struct processing_module *mod, uint32_t config_id, uint32_t channel_count = cfg->mixer_mode_sink_configs[i].output_channel_count; if (channel_count < 1 || channel_count > 8) { - comp_err(dev, "mixin_set_config(): Invalid output_channel_count %u for sink %u", + comp_err(dev, "Invalid output_channel_count %u for sink %u", channel_count, sink_index); return -EINVAL; } @@ -943,7 +943,7 @@ static int mixin_set_config(struct processing_module *mod, uint32_t config_id, mixin_data->sink_config[sink_index].output_channel_map = cfg->mixer_mode_sink_configs[i].output_channel_map; - comp_dbg(dev, "mixin_set_config(): output_channel_count: %u, chmap: 0x%x for sink: %u", + comp_dbg(dev, "output_channel_count: %u, chmap: 0x%x for sink: %u", channel_count, mixin_data->sink_config[sink_index].output_channel_map, sink_index); diff --git a/src/audio/module_adapter/module/cadence.c b/src/audio/module_adapter/module/cadence.c index 87ee611eb19f..e54641ad1b1a 100644 --- a/src/audio/module_adapter/module/cadence.c +++ b/src/audio/module_adapter/module/cadence.c @@ -117,7 +117,7 @@ static int cadence_codec_resolve_api(struct processing_module *mod) /* For ipc4 protocol codec parameters has to be retrieved from configuration */ if (!codec->cfg.data) { - comp_err(dev, "cadence_codec_resolve_api(): could not find cadence config"); + comp_err(dev, "could not find cadence config"); return -EINVAL; } param = codec->cfg.data; @@ -133,7 +133,7 @@ static int cadence_codec_resolve_api(struct processing_module *mod) /* Verify API assignment */ if (!api) { - comp_err(dev, "cadence_codec_resolve_api(): could not find API function for id %x", + comp_err(dev, "could not find API function for id %x", api_id); return -EINVAL; } @@ -193,7 +193,7 @@ static int cadence_codec_resolve_api(struct processing_module *mod) /* Verify API assignment */ if (!api) { - comp_err(dev, "cadence_codec_resolve_api(): could not find API function for id %x", + comp_err(dev, "could not find API function for id %x", api_id); return -EINVAL; } @@ -237,11 +237,11 @@ static int cadence_codec_post_init(struct processing_module *mod) /* Allocate space for codec object */ cd->self = rballoc(SOF_MEM_FLAG_USER, obj_size); if (!cd->self) { - comp_err(dev, "cadence_codec_init(): failed to allocate space for lib object"); + comp_err(dev, "failed to allocate space for lib object"); return -ENOMEM; } - comp_dbg(dev, "cadence_codec_post_init(): allocated %d bytes for lib object", obj_size); + comp_dbg(dev, "allocated %d bytes for lib object", obj_size); /* Set all params to their default values */ API_CALL(cd, XA_API_CMD_INIT, XA_CMD_TYPE_INIT_API_PRE_CONFIG_PARAMS, @@ -270,7 +270,7 @@ static int cadence_codec_init(struct processing_module *mod) cd = rzalloc(SOF_MEM_FLAG_USER, sizeof(struct cadence_codec_data)); if (!cd) { - comp_err(dev, "cadence_codec_init(): failed to allocate memory for cadence codec data"); + comp_err(dev, "failed to allocate memory for cadence codec data"); return -ENOMEM; } @@ -287,7 +287,7 @@ static int cadence_codec_init(struct processing_module *mod) setup_cfg->data = rmalloc(SOF_MEM_FLAG_USER, cfg->param_size); if (!setup_cfg->data) { - comp_err(dev, "cadence_codec_init(): failed to alloc setup config"); + comp_err(dev, "failed to alloc setup config"); ret = -ENOMEM; goto free; } @@ -296,7 +296,7 @@ static int cadence_codec_init(struct processing_module *mod) codec->cfg.data = rmalloc(SOF_MEM_FLAG_USER, cfg->param_size); if (!codec->cfg.data) { - comp_err(dev, "cadence_codec_init(): failed to alloc runtime setup config"); + comp_err(dev, "failed to alloc runtime setup config"); ret = -ENOMEM; goto free_cfg; } @@ -305,7 +305,7 @@ static int cadence_codec_init(struct processing_module *mod) ret = memcpy_s(codec->cfg.data, codec->cfg.size, cfg->param, cfg->param_size); if (ret) { - comp_err(dev, "cadence_codec_init(): failed to init runtime config %d", + comp_err(dev, "failed to init runtime config %d", ret); goto free_cfg2; } @@ -315,7 +315,7 @@ static int cadence_codec_init(struct processing_module *mod) ret = memcpy_s(setup_cfg->data, setup_cfg->size, cfg->param, cfg->param_size); if (ret) { - comp_err(dev, "cadence_codec_init(): failed to copy setup config %d", ret); + comp_err(dev, "failed to copy setup config %d", ret); goto free_cfg2; } setup_cfg->avail = true; @@ -347,7 +347,7 @@ static int cadence_codec_init(struct processing_module *mod) cd = rzalloc(SOF_MEM_FLAG_USER, sizeof(struct cadence_codec_data)); if (!cd) { - comp_err(dev, "cadence_codec_init(): failed to allocate memory for cadence codec data"); + comp_err(dev, "failed to allocate memory for cadence codec data"); return -ENOMEM; } @@ -362,7 +362,7 @@ static int cadence_codec_init(struct processing_module *mod) setup_cfg->data = rmalloc(SOF_MEM_FLAG_USER, codec->cfg.size); if (!setup_cfg->data) { - comp_err(dev, "cadence_codec_init(): failed to alloc setup config"); + comp_err(dev, "failed to alloc setup config"); ret = -ENOMEM; goto free; } @@ -372,7 +372,7 @@ static int cadence_codec_init(struct processing_module *mod) ret = memcpy_s(setup_cfg->data, setup_cfg->size, codec->cfg.init_data, setup_cfg->size); if (ret) { - comp_err(dev, "cadence_codec_init(): failed to copy setup config %d", ret); + comp_err(dev, "failed to copy setup config %d", ret); goto free_cfg; } setup_cfg->avail = true; @@ -447,12 +447,12 @@ static int cadence_codec_apply_config(struct processing_module *mod) param->data, ret); if (ret != LIB_NO_ERROR) { if (LIB_IS_FATAL_ERROR(ret)) { - comp_err(dev, "cadence_codec_apply_config(): failed to apply parameter: %d value: %d error: %#x", + comp_err(dev, "failed to apply parameter: %d value: %d error: %#x", param->id, *(int32_t *)param->data, ret); return ret; } - comp_warn(dev, "cadence_codec_apply_config(): applied parameter %d value %d with return code: %#x", + comp_warn(dev, "applied parameter %d value %d with return code: %#x", param->id, *(int32_t *)param->data, ret); } /* Obtain next parameter, it starts right after the preceding one */ @@ -694,7 +694,7 @@ static int cadence_codec_prepare(struct processing_module *mod, return -ENOMEM; } - comp_dbg(dev, "cadence_codec_prepare(): allocated %d bytes for memtabs", mem_tabs_size); + comp_dbg(dev, "allocated %d bytes for memtabs", mem_tabs_size); API_CALL(cd, XA_API_CMD_SET_MEMTABS_PTR, 0, cd->mem_tabs, ret); if (ret != LIB_NO_ERROR) { @@ -757,7 +757,7 @@ cadence_codec_process(struct processing_module *mod, /* Proceed only if we have enough data to fill the module buffer completely */ if (input_buffers[0].size < codec->mpd.in_buff_size) { - comp_dbg(dev, "cadence_codec_process(): not enough data to process"); + comp_dbg(dev, "not enough data to process"); return -ENODATA; } @@ -896,12 +896,12 @@ cadence_codec_set_configuration(struct processing_module *mod, uint32_t config_i /* whole configuration received, apply it now */ ret = cadence_codec_apply_config(mod); if (ret) { - comp_err(dev, "cadence_codec_set_configuration(): error %x: runtime config apply failed", + comp_err(dev, "error %x: runtime config apply failed", ret); return ret; } - comp_dbg(dev, "cadence_codec_set_configuration(): config applied"); + comp_dbg(dev, "config applied"); return 0; } diff --git a/src/audio/module_adapter/module/generic.c b/src/audio/module_adapter/module/generic.c index f7983cf67d53..1564f3d86baa 100644 --- a/src/audio/module_adapter/module/generic.c +++ b/src/audio/module_adapter/module/generic.c @@ -28,7 +28,7 @@ int module_load_config(struct comp_dev *dev, const void *cfg, size_t size) comp_dbg(dev, "module_load_config() start"); if (!cfg || !size) { - comp_err(dev, "module_load_config(): wrong input params! dev %zx, cfg %zx size %zu", + comp_err(dev, "wrong input params! dev %zx, cfg %zx size %zu", (size_t)dev, (size_t)cfg, size); return -EINVAL; } @@ -46,7 +46,7 @@ int module_load_config(struct comp_dev *dev, const void *cfg, size_t size) dst->data = rballoc(SOF_MEM_FLAG_USER, size); } if (!dst->data) { - comp_err(dev, "module_load_config(): failed to allocate space for setup config."); + comp_err(dev, "failed to allocate space for setup config."); return -ENOMEM; } @@ -77,7 +77,7 @@ int module_init(struct processing_module *mod) return -EPERM; #endif if (!interface) { - comp_err(dev, "module_init(): module interface not defined for comp id %d", + comp_err(dev, "module interface not defined for comp id %d", dev_comp_id(dev)); return -EIO; } @@ -86,7 +86,7 @@ int module_init(struct processing_module *mod) if (!interface->init || (!!interface->process + !!interface->process_audio_stream + !!interface->process_raw_data < 1)) { - comp_err(dev, "module_init(): comp %d is missing mandatory interfaces", + comp_err(dev, "comp %d is missing mandatory interfaces", dev_comp_id(dev)); return -EIO; } @@ -231,7 +231,7 @@ int module_process_legacy(struct processing_module *mod, struct module_data *md = &mod->priv; if (md->state != MODULE_IDLE) { - comp_err(dev, "module_process(): wrong state of comp_id %x, state %d", + comp_err(dev, "wrong state of comp_id %x, state %d", dev_comp_id(dev), md->state); return -EPERM; } @@ -277,7 +277,7 @@ int module_process_sink_src(struct processing_module *mod, #if CONFIG_IPC_MAJOR_3 struct module_data *md = &mod->priv; if (md->state != MODULE_IDLE) { - comp_err(dev, "module_process(): wrong state of comp_id %x, state %d", + comp_err(dev, "wrong state of comp_id %x, state %d", dev_comp_id(dev), md->state); return -EPERM; } @@ -367,7 +367,7 @@ int module_free(struct processing_module *mod) if (ops->free) { ret = ops->free(mod); if (ret) - comp_warn(mod->dev, "module_free(): error: %d for %d", + comp_warn(mod->dev, "error: %d for %d", ret, dev_comp_id(mod->dev)); } @@ -430,7 +430,7 @@ int module_set_configuration(struct processing_module *mod, /* Check that there is no previous request in progress */ if (md->runtime_params) { - comp_err(dev, "module_set_configuration(): error: busy with previous request"); + comp_err(dev, "error: busy with previous request"); return -EBUSY; } @@ -438,7 +438,7 @@ int module_set_configuration(struct processing_module *mod, return 0; if (md->new_cfg_size > CONFIG_MODULE_MAX_BLOB_SIZE) { - comp_err(dev, "module_set_configuration(): error: blob size is too big cfg size %zu, allowed %d", + comp_err(dev, "error: blob size is too big cfg size %zu, allowed %d", md->new_cfg_size, CONFIG_MODULE_MAX_BLOB_SIZE); return -EINVAL; } @@ -446,7 +446,7 @@ int module_set_configuration(struct processing_module *mod, /* Allocate buffer for new params */ md->runtime_params = rballoc(SOF_MEM_FLAG_USER, md->new_cfg_size); if (!md->runtime_params) { - comp_err(dev, "module_set_configuration(): space allocation for new params failed"); + comp_err(dev, "space allocation for new params failed"); return -ENOMEM; } @@ -454,7 +454,7 @@ int module_set_configuration(struct processing_module *mod, break; default: if (!md->runtime_params) { - comp_err(dev, "module_set_configuration(): error: no memory available for runtime params in consecutive load"); + comp_err(dev, "error: no memory available for runtime params in consecutive load"); return -EIO; } @@ -467,7 +467,7 @@ int module_set_configuration(struct processing_module *mod, ret = memcpy_s(dst, md->new_cfg_size - offset, fragment, fragment_size); if (ret < 0) { - comp_err(dev, "module_set_configuration(): error: %d failed to copy fragment", + comp_err(dev, "error: %d failed to copy fragment", ret); return ret; } @@ -479,9 +479,9 @@ int module_set_configuration(struct processing_module *mod, /* config fully copied, now load it */ ret = module_load_config(dev, md->runtime_params, md->new_cfg_size); if (ret) - comp_err(dev, "module_set_configuration(): error %d: config failed", ret); + comp_err(dev, "error %d: config failed", ret); else - comp_dbg(dev, "module_set_configuration(): config load successful"); + comp_dbg(dev, "config load successful"); md->new_cfg_size = 0; diff --git a/src/audio/module_adapter/module/modules.c b/src/audio/module_adapter/module/modules.c index c7a22f372e3d..7d799083d70b 100644 --- a/src/audio/module_adapter/module/modules.c +++ b/src/audio/module_adapter/module/modules.c @@ -112,7 +112,7 @@ static int modules_free(struct processing_module *mod) comp_info(dev, "modules_free()"); ret = iadk_wrapper_free(module_get_private_data(mod)); if (ret) - comp_err(dev, "modules_free(): iadk_wrapper_free failed with error: %d", ret); + comp_err(dev, "iadk_wrapper_free failed with error: %d", ret); return ret; } diff --git a/src/audio/module_adapter/module/passthrough.c b/src/audio/module_adapter/module/passthrough.c index 6b9f28e3060a..dcb74ef0e469 100644 --- a/src/audio/module_adapter/module/passthrough.c +++ b/src/audio/module_adapter/module/passthrough.c @@ -34,14 +34,14 @@ static int passthrough_codec_prepare(struct processing_module *mod, codec->mpd.in_buff = rballoc(SOF_MEM_FLAG_USER, mod->period_bytes); if (!codec->mpd.in_buff) { - comp_err(dev, "passthrough_codec_prepare(): Failed to alloc in_buff"); + comp_err(dev, "Failed to alloc in_buff"); return -ENOMEM; } codec->mpd.in_buff_size = mod->period_bytes; codec->mpd.out_buff = rballoc(SOF_MEM_FLAG_USER, mod->period_bytes); if (!codec->mpd.out_buff) { - comp_err(dev, "passthrough_codec_prepare(): Failed to alloc out_buff"); + comp_err(dev, "Failed to alloc out_buff"); rfree(codec->mpd.in_buff); return -ENOMEM; } @@ -74,7 +74,7 @@ passthrough_codec_process(struct processing_module *mod, /* Proceed only if we have enough data to fill the module buffer completely */ if (input_buffers[0].size < codec->mpd.in_buff_size) { - comp_dbg(dev, "passthrough_codec_process(): not enough data to process"); + comp_dbg(dev, "not enough data to process"); return -ENODATA; } diff --git a/src/audio/module_adapter/module/waves/waves.c b/src/audio/module_adapter/module/waves/waves.c index d384b2b15334..5fffed71f445 100644 --- a/src/audio/module_adapter/module/waves/waves.c +++ b/src/audio/module_adapter/module/waves/waves.c @@ -495,7 +495,7 @@ static int waves_effect_save_config_blob_to_cache(struct processing_module *mod, data, size); if (ret) { comp_err(dev, - "waves_effect_save_config_blob_to_cache(): failed to copy config blob %d", + "failed to copy config blob %d", ret); module_free_memory(mod, waves_codec->config_blob); waves_codec->config_blob = NULL; @@ -768,7 +768,7 @@ waves_codec_process(struct processing_module *mod, /* Proceed only if we have enough data to fill the module buffer completely */ if (input_buffers[0].size < codec->mpd.in_buff_size) { - comp_dbg(dev, "waves_codec_process(): not enough data to process"); + comp_dbg(dev, "not enough data to process"); return -ENODATA; } @@ -890,12 +890,12 @@ waves_codec_set_configuration(struct processing_module *mod, uint32_t config_id, /* whole configuration received, apply it now */ ret = waves_effect_apply_config(mod); if (ret) { - comp_err(dev, "waves_codec_set_configuration(): error %x: runtime config apply failed", + comp_err(dev, "error %x: runtime config apply failed", ret); return ret; } - comp_dbg(dev, "waves_codec_set_configuration(): config applied"); + comp_dbg(dev, "config applied"); return 0; } diff --git a/src/audio/module_adapter/module_adapter.c b/src/audio/module_adapter/module_adapter.c index 3341cc3bb150..5aaaa8f3ef72 100644 --- a/src/audio/module_adapter/module_adapter.c +++ b/src/audio/module_adapter/module_adapter.c @@ -230,7 +230,7 @@ int module_adapter_prepare(struct comp_dev *dev) } else { ret = comp_verify_params(dev, mod->verify_params_flags, mod->stream_params); if (ret < 0) { - comp_err(dev, "module_adapter_params(): comp_verify_params() failed."); + comp_err(dev, "comp_verify_params() failed."); return ret; } } @@ -291,7 +291,7 @@ int module_adapter_prepare(struct comp_dev *dev) return ret; if (ret == COMP_STATUS_STATE_ALREADY_SET) { - comp_warn(dev, "module_adapter_prepare(): module has already been prepared"); + comp_warn(dev, "module has already been prepared"); return PPL_STATUS_PATH_STOP; } @@ -307,7 +307,7 @@ int module_adapter_prepare(struct comp_dev *dev) sink = comp_dev_get_first_data_consumer(dev); mod->period_bytes = audio_stream_period_bytes(&sink->stream, dev->frames); - comp_dbg(dev, "module_adapter_prepare(): got period_bytes = %u", mod->period_bytes); + comp_dbg(dev, "got period_bytes = %u", mod->period_bytes); /* no more to do for sink/source mode */ if (IS_PROCESSING_MODE_SINK_SOURCE(mod)) @@ -324,19 +324,19 @@ int module_adapter_prepare(struct comp_dev *dev) mod->num_of_sinks++; if (!mod->num_of_sources && !mod->num_of_sinks) { - comp_err(dev, "module_adapter_prepare(): no source and sink buffers connected!"); + comp_err(dev, "no source and sink buffers connected!"); return -EINVAL; } if (mod->num_of_sources > CONFIG_MODULE_MAX_CONNECTIONS || mod->num_of_sinks > CONFIG_MODULE_MAX_CONNECTIONS) { - comp_err(dev, "module_adapter_prepare(): too many connected sinks %d or sources %d!", + comp_err(dev, "too many connected sinks %d or sources %d!", mod->num_of_sinks, mod->num_of_sources); return -EINVAL; } /* check processing mode */ if (IS_PROCESSING_MODE_AUDIO_STREAM(mod) && mod->max_sources > 1 && mod->max_sinks > 1) { - comp_err(dev, "module_adapter_prepare(): Invalid use of simple_copy"); + comp_err(dev, "Invalid use of simple_copy"); return -EINVAL; } @@ -348,7 +348,7 @@ int module_adapter_prepare(struct comp_dev *dev) rzalloc(SOF_MEM_FLAG_USER, sizeof(*mod->input_buffers) * mod->max_sources); if (!mod->input_buffers) { - comp_err(dev, "module_adapter_prepare(): failed to allocate input buffers"); + comp_err(dev, "failed to allocate input buffers"); return -ENOMEM; } } else { @@ -361,7 +361,7 @@ int module_adapter_prepare(struct comp_dev *dev) rzalloc(SOF_MEM_FLAG_USER, sizeof(*mod->output_buffers) * mod->max_sinks); if (!mod->output_buffers) { - comp_err(dev, "module_adapter_prepare(): failed to allocate output buffers"); + comp_err(dev, "failed to allocate output buffers"); ret = -ENOMEM; goto in_out_free; } @@ -427,7 +427,7 @@ int module_adapter_prepare(struct comp_dev *dev) mod->input_buffers[i].data = rballoc(SOF_MEM_FLAG_USER, size); if (!mod->input_buffers[i].data) { - comp_err(mod->dev, "module_adapter_prepare(): Failed to alloc input buffer data"); + comp_err(mod->dev, "Failed to alloc input buffer data"); ret = -ENOMEM; goto in_data_free; } @@ -439,7 +439,7 @@ int module_adapter_prepare(struct comp_dev *dev) list_for_item(blist, &dev->bsink_list) { mod->output_buffers[i].data = rballoc(SOF_MEM_FLAG_USER, md->mpd.out_buff_size); if (!mod->output_buffers[i].data) { - comp_err(mod->dev, "module_adapter_prepare(): Failed to alloc output buffer data"); + comp_err(mod->dev, "Failed to alloc output buffer data"); ret = -ENOMEM; goto out_data_free; } @@ -455,7 +455,7 @@ int module_adapter_prepare(struct comp_dev *dev) uint32_t flags; if (!buffer) { - comp_err(dev, "module_adapter_prepare(): failed to allocate local buffer"); + comp_err(dev, "failed to allocate local buffer"); ret = -ENOMEM; goto free; } @@ -474,7 +474,7 @@ int module_adapter_prepare(struct comp_dev *dev) ret = buffer_set_size(buffer, buff_size, 0); if (ret < 0) { - comp_err(dev, "module_adapter_prepare(): buffer_set_size() failed, buff_size = %u", + comp_err(dev, "buffer_set_size() failed, buff_size = %u", buff_size); goto free; } @@ -526,7 +526,7 @@ int module_adapter_params(struct comp_dev *dev, struct sof_ipc_stream_params *pa ret = comp_verify_params(dev, mod->verify_params_flags, params); if (ret < 0) { - comp_err(dev, "module_adapter_params(): comp_verify_params() failed."); + comp_err(dev, "comp_verify_params() failed."); return ret; } @@ -650,11 +650,11 @@ static void module_copy_samples(struct comp_dev *dev, struct comp_buffer *src_bu return; } - comp_dbg(dev, "module_copy_samples(): deep buffering has ended after gathering %d bytes of processed data", + comp_dbg(dev, "deep buffering has ended after gathering %d bytes of processed data", audio_stream_get_avail_bytes(&src_buffer->stream)); mod->deep_buff_bytes = 0; } else if (!produced) { - comp_dbg(dev, "module_copy_samples(): nothing processed in this call"); + comp_dbg(dev, "nothing processed in this call"); /* * No data produced anything in this period but there still be data in the buffer * to copy to sink @@ -1039,7 +1039,7 @@ static int module_adapter_sink_source_copy(struct comp_dev *dev) int ret; int i = 0; - comp_dbg(dev, "module_adapter_sink_source_copy(): start"); + comp_dbg(dev, "start"); /* reset number of processed bytes */ for (i = 0; i < mod->num_of_sources; i++) @@ -1062,7 +1062,7 @@ static int module_adapter_sink_source_copy(struct comp_dev *dev) for (i = 0; i < mod->num_of_sinks; i++) mod->total_data_produced += sink_get_num_of_processed_bytes(mod->sinks[i]); - comp_dbg(dev, "module_adapter_sink_source_copy(): done"); + comp_dbg(dev, "done"); return ret; } @@ -1077,7 +1077,7 @@ static int module_adapter_raw_data_type_copy(struct comp_dev *dev) uint32_t min_free_frames = UINT_MAX; int ret, i = 0; - comp_dbg(dev, "module_adapter_raw_data_type_copy(): start"); + comp_dbg(dev, "start"); list_for_item(blist, &mod->raw_data_buffers_list) { sink = container_of(blist, struct comp_buffer, buffers_list); @@ -1139,7 +1139,7 @@ static int module_adapter_raw_data_type_copy(struct comp_dev *dev) module_adapter_process_output(dev); - comp_dbg(dev, "module_adapter_raw_data_type_copy(): done"); + comp_dbg(dev, "done"); return 0; @@ -1152,13 +1152,13 @@ static int module_adapter_raw_data_type_copy(struct comp_dev *dev) mod->input_buffers[i].size = 0; mod->input_buffers[i].consumed = 0; } - comp_dbg(dev, "module_adapter_raw_data_type_copy(): error %x", ret); + comp_dbg(dev, "error %x", ret); return ret; } int module_adapter_copy(struct comp_dev *dev) { - comp_dbg(dev, "module_adapter_copy(): start"); + comp_dbg(dev, "start"); struct processing_module *mod = comp_mod(dev); @@ -1176,7 +1176,7 @@ int module_adapter_copy(struct comp_dev *dev) } - comp_err(dev, "module_adapter_copy(): unknown processing_data_type"); + comp_err(dev, "unknown processing_data_type"); return -EINVAL; } EXPORT_SYMBOL(module_adapter_copy); @@ -1186,7 +1186,7 @@ int module_adapter_trigger(struct comp_dev *dev, int cmd) struct processing_module *mod = comp_mod(dev); const struct module_interface *const interface = mod->dev->drv->adapter_ops; - comp_dbg(dev, "module_adapter_trigger(): cmd %d", cmd); + comp_dbg(dev, "cmd %d", cmd); /* handle host/DAI gateway modules separately */ if (dev->ipc_config.type == SOF_COMP_HOST || dev->ipc_config.type == SOF_COMP_DAI) @@ -1213,12 +1213,12 @@ int module_adapter_reset(struct comp_dev *dev) struct processing_module *mod = comp_mod(dev); struct list_item *blist; - comp_dbg(dev, "module_adapter_reset(): resetting"); + comp_dbg(dev, "resetting"); ret = module_reset(mod); if (ret) { if (ret != PPL_STATUS_PATH_STOP) - comp_err(dev, "module_adapter_reset(): failed with error: %d", ret); + comp_err(dev, "failed with error: %d", ret); return ret; } @@ -1249,7 +1249,7 @@ int module_adapter_reset(struct comp_dev *dev) rfree(mod->stream_params); mod->stream_params = NULL; - comp_dbg(dev, "module_adapter_reset(): done"); + comp_dbg(dev, "done"); return comp_set_state(dev, COMP_TRIGGER_RESET); } @@ -1261,11 +1261,11 @@ void module_adapter_free(struct comp_dev *dev) struct processing_module *mod = comp_mod(dev); struct list_item *blist, *_blist; - comp_dbg(dev, "module_adapter_free(): start"); + comp_dbg(dev, "start"); ret = module_free(mod); if (ret) - comp_err(dev, "module_adapter_free(): failed with error: %d", ret); + comp_err(dev, "failed with error: %d", ret); list_for_item_safe(blist, _blist, &mod->raw_data_buffers_list) { struct comp_buffer *buffer = container_of(blist, struct comp_buffer, diff --git a/src/audio/module_adapter/module_adapter_ipc3.c b/src/audio/module_adapter/module_adapter_ipc3.c index 3f64bd99971f..30aa8492c25d 100644 --- a/src/audio/module_adapter/module_adapter_ipc3.c +++ b/src/audio/module_adapter/module_adapter_ipc3.c @@ -186,7 +186,7 @@ static int module_adapter_get_set_params(struct comp_dev *dev, struct sof_ipc_ct uint32_t data_offset_size; static uint32_t size; - comp_dbg(dev, "module_adapter_set_params(): num_of_elem %d, elem remain %d msg_index %u", + comp_dbg(dev, "num_of_elem %d, elem remain %d msg_index %u", cdata->num_elems, cdata->elems_remaining, cdata->msg_index); /* set the fragment position, data offset and config data size */ @@ -216,7 +216,7 @@ static int module_adapter_get_set_params(struct comp_dev *dev, struct sof_ipc_ct (const uint8_t *)cdata, cdata->num_elems, NULL, 0); - comp_warn(dev, "module_adapter_get_set_params(): no configuration op set for %d", + comp_warn(dev, "no configuration op set for %d", dev_comp_id(dev)); return 0; } @@ -225,7 +225,7 @@ static int module_adapter_get_set_params(struct comp_dev *dev, struct sof_ipc_ct return interface->get_configuration(mod, pos, &data_offset_size, (uint8_t *)cdata, cdata->num_elems); - comp_err(dev, "module_adapter_get_set_params(): no configuration op get for %d", + comp_err(dev, "no configuration op get for %d", dev_comp_id(dev)); return -EIO; /* non-implemented error */ } @@ -241,13 +241,13 @@ static int module_adapter_ctrl_get_set_data(struct comp_dev *dev, struct sof_ipc /* Check version from ABI header */ if (SOF_ABI_VERSION_INCOMPATIBLE(SOF_ABI_VERSION, cdata->data->abi)) { - comp_err(dev, "module_adapter_ctrl_set_data(): ABI mismatch!"); + comp_err(dev, "ABI mismatch!"); return -EINVAL; } switch (cdata->cmd) { case SOF_CTRL_CMD_ENUM: - comp_err(dev, "module_adapter_ctrl_set_data(): set enum is not implemented"); + comp_err(dev, "set enum is not implemented"); ret = -EIO; break; case SOF_CTRL_CMD_BINARY: diff --git a/src/audio/module_adapter/module_adapter_ipc4.c b/src/audio/module_adapter/module_adapter_ipc4.c index a4acf4727c41..3f0f7dc6f329 100644 --- a/src/audio/module_adapter/module_adapter_ipc4.c +++ b/src/audio/module_adapter/module_adapter_ipc4.c @@ -200,7 +200,7 @@ int module_set_large_config(struct comp_dev *dev, uint32_t param_id, bool first_ fragment_size = md->new_cfg_size - data_offset_size; break; default: - comp_err(dev, "module_set_large_config(): invalid fragment position"); + comp_err(dev, "invalid fragment position"); return -EINVAL; } diff --git a/src/audio/multiband_drc/multiband_drc.c b/src/audio/multiband_drc/multiband_drc.c index 97d2c0974d18..74cdb0ebcdd4 100644 --- a/src/audio/multiband_drc/multiband_drc.c +++ b/src/audio/multiband_drc/multiband_drc.c @@ -260,7 +260,7 @@ static int multiband_drc_init(struct processing_module *mod) /* Handler for configuration data */ cd->model_handler = comp_data_blob_handler_new(dev); if (!cd->model_handler) { - comp_err(dev, "multiband_drc_init(): comp_data_blob_handler_new() failed."); + comp_err(dev, "comp_data_blob_handler_new() failed."); ret = -ENOMEM; goto cd_fail; } @@ -268,7 +268,7 @@ static int multiband_drc_init(struct processing_module *mod) /* Get configuration data and reset DRC state */ ret = comp_init_data_blob(cd->model_handler, bs, cfg->data); if (ret < 0) { - comp_err(dev, "multiband_drc_init(): comp_init_data_blob() failed."); + comp_err(dev, "comp_init_data_blob() failed."); goto cd_fail; } multiband_drc_reset_state(&cd->state); diff --git a/src/audio/mux/mux.c b/src/audio/mux/mux.c index fe8f6d881ab2..a4313e45f4ea 100644 --- a/src/audio/mux/mux.c +++ b/src/audio/mux/mux.c @@ -89,7 +89,7 @@ static int mux_demux_common_init(struct processing_module *mod, enum sof_comp_ty comp_dbg(dev, "mux_init()"); if (cfg->size > MUX_BLOB_MAX_SIZE) { - comp_err(dev, "mux_init(): blob size %zu exceeds %zu", + comp_err(dev, "blob size %zu exceeds %zu", cfg->size, MUX_BLOB_MAX_SIZE); return -EINVAL; } @@ -101,7 +101,7 @@ static int mux_demux_common_init(struct processing_module *mod, enum sof_comp_ty cd->model_handler = comp_data_blob_handler_new(dev); if (!cd->model_handler) { - comp_err(dev, "mux_init(): comp_data_blob_handler_new() failed."); + comp_err(dev, "comp_data_blob_handler_new() failed."); ret = -ENOMEM; goto err; } @@ -109,7 +109,7 @@ static int mux_demux_common_init(struct processing_module *mod, enum sof_comp_ty module_data->private = cd; ret = comp_init_data_blob(cd->model_handler, cfg->size, cfg->init_data); if (ret < 0) { - comp_err(dev, "mux_init(): comp_init_data_blob() failed."); + comp_err(dev, "comp_init_data_blob() failed."); goto err_init; } @@ -152,7 +152,7 @@ static int get_stream_index(struct comp_dev *dev, struct comp_data *cd, uint32_t if (cd->config.streams[idx].pipeline_id == pipe_id) return idx; - comp_err(dev, "get_stream_index(): couldn't find configuration for connected pipeline %u", + comp_err(dev, "couldn't find configuration for connected pipeline %u", pipe_id); return -EINVAL; } @@ -199,7 +199,7 @@ static struct mux_look_up *get_lookup_table(struct comp_dev *dev, struct comp_da if (cd->config.streams[i].pipeline_id == pipe_id) return &cd->lookup[i]; - comp_err(dev, "get_lookup_table(): couldn't find configuration for connected pipeline %u", + comp_err(dev, "couldn't find configuration for connected pipeline %u", pipe_id); return 0; } @@ -400,7 +400,7 @@ static int mux_prepare(struct processing_module *mod, config = comp_get_data_blob(cd->model_handler, &blob_size, NULL); if (blob_size > MUX_BLOB_MAX_SIZE) { - comp_err(dev, "mux_prepare(): illegal blob size %zu", blob_size); + comp_err(dev, "illegal blob size %zu", blob_size); return -EINVAL; } @@ -416,7 +416,7 @@ static int mux_prepare(struct processing_module *mod, cd->demux = demux_get_processing_function(mod); if (!cd->mux && !cd->demux) { - comp_err(dev, "mux_prepare(): Invalid configuration, couldn't find suitable processing function."); + comp_err(dev, "Invalid configuration, couldn't find suitable processing function."); return -EINVAL; } diff --git a/src/audio/mux/mux_ipc3.c b/src/audio/mux/mux_ipc3.c index 4c658d8e588d..4a39dd277012 100644 --- a/src/audio/mux/mux_ipc3.c +++ b/src/audio/mux/mux_ipc3.c @@ -42,7 +42,7 @@ static int mux_set_values(struct processing_module *mod) /* check if number of streams configured doesn't exceed maximum */ if (cfg->num_streams > MUX_MAX_STREAMS) { - comp_err(dev, "mux_set_values(): configured number of streams (%u) exceeds maximum = " + comp_err(dev, "configured number of streams (%u) exceeds maximum = " STRINGIFY(MUX_MAX_STREAMS), cfg->num_streams); return -EINVAL; } @@ -52,7 +52,7 @@ static int mux_set_values(struct processing_module *mod) for (j = i + 1; j < cfg->num_streams; j++) { if (cfg->streams[i].pipeline_id == cfg->streams[j].pipeline_id) { - comp_err(dev, "mux_set_values(): multiple configured streams have same pipeline ID = %u", + comp_err(dev, "multiple configured streams have same pipeline ID = %u", cfg->streams[i].pipeline_id); return -EINVAL; } @@ -62,7 +62,7 @@ static int mux_set_values(struct processing_module *mod) for (i = 0; i < cfg->num_streams; i++) { for (j = 0 ; j < PLATFORM_MAX_CHANNELS; j++) { if (popcount(cfg->streams[i].mask[j]) > 1) { - comp_err(dev, "mux_set_values(): mux component is not able to mix channels"); + comp_err(dev, "mux component is not able to mix channels"); return -EINVAL; } } @@ -70,7 +70,7 @@ static int mux_set_values(struct processing_module *mod) if (cd->comp_type == SOF_COMP_MUX) { if (mux_mix_check(cfg)) - comp_err(dev, "mux_set_values(): mux component is not able to mix channels"); + comp_err(dev, "mux component is not able to mix channels"); } for (i = 0; i < cfg->num_streams; i++) { diff --git a/src/audio/mux/mux_ipc4.c b/src/audio/mux/mux_ipc4.c index 446ad2f566ae..9d844ac15efa 100644 --- a/src/audio/mux/mux_ipc4.c +++ b/src/audio/mux/mux_ipc4.c @@ -57,7 +57,7 @@ static int build_config(struct processing_module *mod) /* validation of matrix mixing */ if (mux_mix_check(&cd->config)) { - comp_err(dev, "build_config(): mux component is not able to mix channels"); + comp_err(dev, "mux component is not able to mix channels"); return -EINVAL; } return 0; diff --git a/src/audio/pipeline/pipeline-graph.c b/src/audio/pipeline/pipeline-graph.c index e3c0163af1c0..4dc4466865f3 100644 --- a/src/audio/pipeline/pipeline-graph.c +++ b/src/audio/pipeline/pipeline-graph.c @@ -122,7 +122,7 @@ struct pipeline *pipeline_new(uint32_t pipeline_id, uint32_t priority, uint32_t /* allocate new pipeline */ p = rzalloc(SOF_MEM_FLAG_USER, sizeof(*p)); if (!p) { - pipe_cl_err("pipeline_new(): Out of Memory"); + pipe_cl_err("Out of Memory"); return NULL; } @@ -135,13 +135,13 @@ struct pipeline *pipeline_new(uint32_t pipeline_id, uint32_t priority, uint32_t ret = memcpy_s(&p->tctx, sizeof(struct tr_ctx), &pipe_tr, sizeof(struct tr_ctx)); if (ret < 0) { - pipe_err(p, "pipeline_new(): failed to copy trace settings"); + pipe_err(p, "failed to copy trace settings"); goto free; } ret = pipeline_posn_offset_get(&p->posn_offset); if (ret < 0) { - pipe_err(p, "pipeline_new(): pipeline_posn_offset_get failed %d", + pipe_err(p, "pipeline_posn_offset_get failed %d", ret); goto free; } @@ -152,7 +152,7 @@ struct pipeline *pipeline_new(uint32_t pipeline_id, uint32_t priority, uint32_t if (posn.rhdr.hdr.size) { p->msg = ipc_msg_init(posn.rhdr.hdr.cmd, posn.rhdr.hdr.size); if (!p->msg) { - pipe_err(p, "pipeline_new(): ipc_msg_init failed"); + pipe_err(p, "ipc_msg_init failed"); goto free; } } @@ -293,7 +293,7 @@ int pipeline_complete(struct pipeline *p, struct comp_dev *source, /* check whether pipeline is already completed */ if (p->status != COMP_STATE_INIT) { - pipe_err(p, "pipeline_complete(): Pipeline already completed"); + pipe_err(p, "Pipeline already completed"); return -EINVAL; } @@ -329,7 +329,7 @@ static int pipeline_comp_reset(struct comp_dev *current, dev_comp_id(current), dir); if (!p->source_comp) { - pipe_err(p, "pipeline_comp_reset(): source_comp is NULL"); + pipe_err(p, "source_comp is NULL"); return -EINVAL; } @@ -354,10 +354,10 @@ static int pipeline_comp_reset(struct comp_dev *current, * 2. trigger functon skipped due to error of other component's trigger function */ if (current->state == COMP_STATE_ACTIVE) { - pipe_warn(current->pipeline, "pipeline_comp_reset(): component is in active state, try to stop it"); + pipe_warn(current->pipeline, "component is in active state, try to stop it"); err = comp_trigger(current, COMP_TRIGGER_STOP); if (err) - pipe_err(current->pipeline, "pipeline_comp_reset(): failed to recover"); + pipe_err(current->pipeline, "failed to recover"); } err = comp_reset(current); @@ -387,7 +387,7 @@ int pipeline_reset(struct pipeline *p, struct comp_dev *host) ret = walk_ctx.comp_func(host, NULL, &walk_ctx, host->direction); if (ret < 0) { - pipe_err(p, "pipeline_reset(): ret = %d, host->comp.id = 0x%x", + pipe_err(p, "ret = %d, host->comp.id = 0x%x", ret, dev_comp_id(host)); } else { /* pipeline is reset to default state */ diff --git a/src/audio/pipeline/pipeline-params.c b/src/audio/pipeline/pipeline-params.c index 2fa3d19e62bc..f2aa30b978c1 100644 --- a/src/audio/pipeline/pipeline-params.c +++ b/src/audio/pipeline/pipeline-params.c @@ -60,7 +60,7 @@ static int pipeline_comp_params_neg(struct comp_dev *current, * drop an error and reject the .params() command. */ pipe_err(current->pipeline, - "pipeline_comp_params_neg(): params conflict with existing active pipeline!"); + "params conflict with existing active pipeline!"); err = -EINVAL; } } @@ -144,7 +144,7 @@ static int pipeline_comp_hw_params(struct comp_dev *current, &ppl_data->params->params, dir); if (ret < 0) { pipe_err(current->pipeline, - "pipeline_comp_hw_params(): failed getting DAI parameters: %d", + "failed getting DAI parameters: %d", ret); return ret; } @@ -170,7 +170,7 @@ static int pipeline_comp_hw_params_buf(struct comp_dev *current, BUFFER_UPDATE_IF_UNSET); if (ret < 0) pipe_err(current->pipeline, - "pipeline_comp_hw_params(): buffer_set_params(): %d", ret); + "buffer_set_params(): %d", ret); } return ret; @@ -226,14 +226,14 @@ int pipeline_params(struct pipeline *p, struct comp_dev *host, ret = hw_param_ctx.comp_func(host, NULL, &hw_param_ctx, dir); if (ret < 0) { - pipe_err(p, "pipeline_params(): ret = %d, dev->comp.id = 0x%x", + pipe_err(p, "ret = %d, dev->comp.id = 0x%x", ret, dev_comp_id(host)); return ret; } ret = buf_param_ctx.comp_func(host, NULL, &buf_param_ctx, dir); if (ret < 0) { - pipe_err(p, "pipeline_params(): ret = %d, dev->comp.id = 0x%x", + pipe_err(p, "ret = %d, dev->comp.id = 0x%x", ret, dev_comp_id(host)); return ret; } @@ -244,7 +244,7 @@ int pipeline_params(struct pipeline *p, struct comp_dev *host, ret = param_ctx.comp_func(host, NULL, ¶m_ctx, dir); if (ret < 0) { - pipe_err(p, "pipeline_params(): ret = %d, host->comp.id = 0x%x", + pipe_err(p, "ret = %d, host->comp.id = 0x%x", ret, dev_comp_id(host)); } @@ -312,7 +312,7 @@ int pipeline_prepare(struct pipeline *p, struct comp_dev *dev) ret = walk_ctx.comp_func(dev, NULL, &walk_ctx, dev->direction); if (ret < 0) { - pipe_err(p, "pipeline_prepare(): ret = %d, dev->comp.id = 0x%x", + pipe_err(p, "ret = %d, dev->comp.id = 0x%x", ret, dev_comp_id(dev)); return ret; } diff --git a/src/audio/pipeline/pipeline-schedule.c b/src/audio/pipeline/pipeline-schedule.c index 15f41759bbd3..20afcc6fb552 100644 --- a/src/audio/pipeline/pipeline-schedule.c +++ b/src/audio/pipeline/pipeline-schedule.c @@ -100,7 +100,7 @@ static enum task_state pipeline_task_cmd(struct pipeline *p, err = pipeline_trigger_run(p, host, cmd); if (err < 0) { - pipe_err(p, "pipeline_task_cmd(): failed to trigger components: %d", err); + pipe_err(p, "failed to trigger components: %d", err); reply->error = err; err = SOF_TASK_STATE_COMPLETED; } else { @@ -225,7 +225,7 @@ static enum task_state pipeline_task(void *arg) /* try to recover */ err = pipeline_xrun_recover(p); if (err < 0) { - pipe_err(p, "pipeline_task(): xrun recovery failed! pipeline is stopped."); + pipe_err(p, "xrun recovery failed! pipeline is stopped."); /* failed - host will stop this pipeline */ return SOF_TASK_STATE_COMPLETED; } @@ -359,7 +359,7 @@ int pipeline_comp_ll_task_init(struct pipeline *p) p->pipe_task = pipeline_task_init(p, type); if (!p->pipe_task) { - pipe_err(p, "pipeline_comp_task_init(): task init failed"); + pipe_err(p, "task init failed"); return -ENOMEM; } } diff --git a/src/audio/pipeline/pipeline-stream.c b/src/audio/pipeline/pipeline-stream.c index bdeefbccde80..6ababd12d838 100644 --- a/src/audio/pipeline/pipeline-stream.c +++ b/src/audio/pipeline/pipeline-stream.c @@ -183,7 +183,7 @@ int pipeline_copy(struct pipeline *p) ret = walk_ctx.comp_func(start, NULL, &walk_ctx, dir); if (ret < 0) - pipe_err(p, "pipeline_copy(): ret = %d, start->comp.id = %u, dir = %u", + pipe_err(p, "ret = %d, start->comp.id = %u, dir = %u", ret, dev_comp_id(start), dir); return ret; @@ -267,7 +267,7 @@ static int pipeline_trigger_list(struct pipeline *p, struct comp_dev *host, int ret = walk_ctx.comp_func(host, NULL, &walk_ctx, host->direction); if (ret < 0) { - pipe_err(p, "pipeline_trigger_list(): ret = %d, host->comp.id = %u, cmd = %d", + pipe_err(p, "ret = %d, host->comp.id = %u, cmd = %d", ret, dev_comp_id(host), cmd); } else { if (cmd == COMP_TRIGGER_PRE_START) { @@ -595,7 +595,7 @@ int pipeline_trigger_run(struct pipeline *p, struct comp_dev *host, int cmd) ret = walk_ctx.comp_func(host, NULL, &walk_ctx, host->direction); if (ret < 0) { - pipe_err(p, "pipeline_trigger_run(): ret = %d, host->comp.id = %u, cmd = %d", + pipe_err(p, "ret = %d, host->comp.id = %u, cmd = %d", ret, dev_comp_id(host), cmd); goto out; } @@ -624,7 +624,7 @@ int pipeline_trigger_run(struct pipeline *p, struct comp_dev *host, int cmd) ret = walk_ctx.comp_func(host, NULL, &walk_ctx, host->direction); if (ret < 0) - pipe_err(p, "pipeline_trigger_run(): ret = %d, host->comp.id = %u, cmd = %d", + pipe_err(p, "ret = %d, host->comp.id = %u, cmd = %d", ret, dev_comp_id(host), cmd); else if (ret == PPL_STATUS_PATH_STOP) ret = 0; @@ -658,7 +658,7 @@ void pipeline_get_timestamp(struct pipeline *p, struct comp_dev *host, dai = pipeline_get_dai_comp(host->pipeline->pipeline_id, PPL_DIR_UPSTREAM); if (!dai) { - pipe_dbg(p, "pipeline_get_timestamp(): DAI position update failed"); + pipe_dbg(p, "DAI position update failed"); return; } diff --git a/src/audio/pipeline/pipeline-xrun.c b/src/audio/pipeline/pipeline-xrun.c index 480a428d6f67..3b727074ab97 100644 --- a/src/audio/pipeline/pipeline-xrun.c +++ b/src/audio/pipeline/pipeline-xrun.c @@ -68,7 +68,7 @@ int pipeline_xrun_recover(struct pipeline *p) /* prepare the pipeline */ ret = pipeline_prepare(p, p->source_comp); if (ret < 0) { - pipe_err(p, "pipeline_xrun_recover(): pipeline_prepare() failed, ret = %d", + pipe_err(p, "pipeline_prepare() failed, ret = %d", ret); return ret; } @@ -79,7 +79,7 @@ int pipeline_xrun_recover(struct pipeline *p) /* restart pipeline comps */ ret = pipeline_trigger(p, p->source_comp, COMP_TRIGGER_START); if (ret < 0) { - pipe_err(p, "pipeline_xrun_recover(): pipeline_trigger() failed, ret = %d", + pipe_err(p, "pipeline_trigger() failed, ret = %d", ret); return ret; } @@ -159,7 +159,7 @@ void pipeline_xrun(struct pipeline *p, struct comp_dev *dev, /* notify all pipeline comps we are in XRUN, and stop copying */ ret = pipeline_trigger(p, p->source_comp, COMP_TRIGGER_XRUN); if (ret < 0) - pipe_err(p, "pipeline_xrun(): Pipelines notification about XRUN failed, ret = %d", + pipe_err(p, "Pipelines notification about XRUN failed, ret = %d", ret); memset(&posn, 0, sizeof(posn)); diff --git a/src/audio/rtnr/rtnr.c b/src/audio/rtnr/rtnr.c index 19652a8a40e0..0078ce275b33 100644 --- a/src/audio/rtnr/rtnr.c +++ b/src/audio/rtnr/rtnr.c @@ -252,14 +252,14 @@ static int rtnr_init(struct processing_module *mod) /* Handler for component data */ cd->model_handler = comp_data_blob_handler_new(dev); if (!cd->model_handler) { - comp_err(dev, "rtnr_new(): comp_data_blob_handler_new() failed."); + comp_err(dev, "comp_data_blob_handler_new() failed."); ret = -ENOMEM; goto cd_fail; } ret = comp_init_data_blob(cd->model_handler, bs, ipc_rtnr->data); if (ret < 0) { - comp_err(dev, "rtnr_init(): comp_init_data_blob() failed with error: %d", ret); + comp_err(dev, "comp_init_data_blob() failed with error: %d", ret); goto cd_fail; } @@ -268,11 +268,11 @@ static int rtnr_init(struct processing_module *mod) cd->rtk_agl = RTKMA_API_Context_Create(cd->process_sample_rate); if (cd->rtk_agl == 0) { - comp_err(dev, "rtnr_new(): RTKMA_API_Context_Create failed."); + comp_err(dev, "RTKMA_API_Context_Create failed."); ret = -EINVAL; goto cd_fail; } - comp_info(dev, "rtnr_new(): RTKMA_API_Context_Create succeeded."); + comp_info(dev, "RTKMA_API_Context_Create succeeded."); /* comp_is_new_data_blob_available always returns false for the first * control write with non-empty config. The first non-empty write may @@ -395,7 +395,7 @@ static int rtnr_get_comp_data(struct processing_module *mod, struct sof_ipc_ctrl max_data_size, config, size); - comp_info(mod->dev, "rtnr_get_comp_data(): size= %d, ret = %d", + comp_info(mod->dev, "size= %d, ret = %d", size, ret); if (ret) return ret; @@ -415,18 +415,18 @@ static int rtnr_get_bin_data(struct processing_module *mod, struct sof_ipc_ctrl_ if (!dev) return -ENODEV; - comp_err(dev, "rtnr_get_bin_data(): type = %u, index = %u, size = %d", + comp_err(dev, "type = %u, index = %u, size = %d", cdata->data->type, cdata->msg_index, cdata->num_elems); switch (cdata->data->type) { case SOF_RTNR_CONFIG: - comp_err(dev, "rtnr_get_bin_data(): SOF_RTNR_CONFIG"); + comp_err(dev, "SOF_RTNR_CONFIG"); return rtnr_get_comp_config(mod, cdata, max_data_size); case SOF_RTNR_DATA: - comp_err(dev, "rtnr_get_bin_data(): SOF_RTNR_DATA"); + comp_err(dev, "SOF_RTNR_DATA"); return rtnr_get_comp_data(mod, cdata, max_data_size); default: - comp_err(dev, "rtnr_get_bin_data(): unknown binary data type"); + comp_err(dev, "unknown binary data type"); return -EINVAL; } } @@ -502,11 +502,11 @@ static int rtnr_reconfigure(struct processing_module *mod) } if (!config) { - comp_err(dev, "rtnr_reconfigure(): Config not set"); + comp_err(dev, "Config not set"); return -EINVAL; } - comp_info(dev, "rtnr_reconfigure(): New data applied %p (%zu bytes)", + comp_info(dev, "New data applied %p (%zu bytes)", config, size); cd->reconfigure = false; @@ -530,7 +530,7 @@ static int rtnr_set_config_bytes(struct processing_module *mod, * the whole config data is received. */ if (size < sizeof(cd->config)) { - comp_err(dev, "rtnr_set_config_data(): invalid size %u", + comp_err(dev, "invalid size %u", size); return -EINVAL; } @@ -541,7 +541,7 @@ static int rtnr_set_config_bytes(struct processing_module *mod, sizeof(cd->config)); comp_info(dev, - "rtnr_set_config_data(): sample_rate = %u, enabled=%d", + "sample_rate = %u, enabled=%d", cd->config.params.sample_rate, cd->config.params.enabled); @@ -566,10 +566,10 @@ static int32_t rtnr_set_value(struct processing_module *mod, void *ctl_data) } if (val) { - comp_info(dev, "rtnr_set_value(): enabled"); + comp_info(dev, "enabled"); cd->process_enable = true; } else { - comp_info(dev, "rtnr_set_value(): passthrough"); + comp_info(dev, "passthrough"); cd->process_enable = false; } @@ -591,7 +591,7 @@ static int rtnr_set_config(struct processing_module *mod, uint32_t param_id, switch (cdata->cmd) { case SOF_CTRL_CMD_BINARY: if (dev->state < COMP_STATE_READY) { - comp_err(dev, "rtnr_set_config(): driver in init!"); + comp_err(dev, "driver in init!"); return -EBUSY; } @@ -621,7 +621,7 @@ static int rtnr_set_config(struct processing_module *mod, uint32_t param_id, return 0; } - comp_err(dev, "rtnr_set_config(): unknown binary data type"); + comp_err(dev, "unknown binary data type"); return -EINVAL; case SOF_CTRL_CMD_SWITCH: @@ -642,7 +642,7 @@ static int rtnr_set_config(struct processing_module *mod, uint32_t param_id, case SOF_RTNR_CONFIG: comp_dbg(dev, "rtnr_set_config(), SOF_RTNR_CONFIG"); if (dev->state < COMP_STATE_READY) { - comp_err(dev, "rtnr_set_config(): driver in init!"); + comp_err(dev, "driver in init!"); return -EBUSY; } @@ -650,7 +650,7 @@ static int rtnr_set_config(struct processing_module *mod, uint32_t param_id, case SOF_RTNR_DATA: comp_dbg(dev, "rtnr_set_config(), SOF_RTNR_DATA"); if (dev->state < COMP_STATE_READY) { - comp_err(dev, "rtnr_set_config(): driver in init!"); + comp_err(dev, "driver in init!"); return -EBUSY; } @@ -815,7 +815,7 @@ static int rtnr_prepare(struct processing_module *mod, /* Check config */ ret = rtnr_check_config_validity(mod); if (ret < 0) { - comp_err(dev, "rtnr_prepare(): rtnr_check_config_validity() failed."); + comp_err(dev, "rtnr_check_config_validity() failed."); goto err; } @@ -832,7 +832,7 @@ static int rtnr_prepare(struct processing_module *mod, comp_info(dev, "rtnr_prepare(), sink_format=%d", cd->sink_format); cd->rtnr_func = rtnr_find_func(cd->sink_format); if (!cd->rtnr_func) { - comp_err(dev, "rtnr_prepare(): No suitable processing function found."); + comp_err(dev, "No suitable processing function found."); ret = -EINVAL; goto err; } diff --git a/src/audio/selector/selector.c b/src/audio/selector/selector.c index afb5d091575c..d0f52a92303b 100644 --- a/src/audio/selector/selector.c +++ b/src/audio/selector/selector.c @@ -68,7 +68,7 @@ static int selector_verify_params(struct comp_dev *dev, buffer = comp_dev_get_first_data_consumer(dev); if (cd->config.in_channels_count && cd->config.in_channels_count != params->channels) { - comp_err(dev, "selector_verify_params(): src in_channels_count does not match pcm channels"); + comp_err(dev, "src in_channels_count does not match pcm channels"); return -EINVAL; } in_channels = cd->config.in_channels_count; @@ -86,7 +86,7 @@ static int selector_verify_params(struct comp_dev *dev, buffer = comp_dev_get_first_data_producer(dev); if (cd->config.out_channels_count && cd->config.out_channels_count != params->channels) { - comp_err(dev, "selector_verify_params(): src in_channels_count does not match pcm channels"); + comp_err(dev, "src in_channels_count does not match pcm channels"); return -EINVAL; } out_channels = cd->config.out_channels_count; @@ -113,7 +113,7 @@ static int selector_verify_params(struct comp_dev *dev, case SEL_SOURCE_4CH: break; default: - comp_err(dev, "selector_verify_params(): in_channels = %u", in_channels); + comp_err(dev, "in_channels = %u", in_channels); return -EINVAL; } @@ -125,19 +125,19 @@ static int selector_verify_params(struct comp_dev *dev, case SEL_SINK_4CH: /* verify proper channels for passthrough mode */ if (in_channels != out_channels) { - comp_err(dev, "selector_verify_params(): in_channels = %u, out_channels = %u" + comp_err(dev, "in_channels = %u, out_channels = %u" , in_channels, out_channels); return -EINVAL; } break; default: - comp_err(dev, "selector_verify_params(): out_channels = %u" + comp_err(dev, "out_channels = %u" , out_channels); return -EINVAL; } if (cd->config.sel_channel > (params->channels - 1)) { - comp_err(dev, "selector_verify_params(): ch_idx = %u" + comp_err(dev, "ch_idx = %u" , cd->config.sel_channel); return -EINVAL; } @@ -211,7 +211,7 @@ static int selector_params(struct comp_dev *dev, err = selector_verify_params(dev, params); if (err < 0) { - comp_err(dev, "selector_params(): pcm params verification failed."); + comp_err(dev, "pcm params verification failed."); return -EINVAL; } @@ -244,7 +244,7 @@ static int selector_ctrl_set_data(struct comp_dev *dev, cd->config.sel_channel = cfg->sel_channel; break; default: - comp_err(dev, "selector_ctrl_set_cmd(): invalid cdata->cmd = %u", + comp_err(dev, "invalid cdata->cmd = %u", cdata->cmd); ret = -EINVAL; break; @@ -284,7 +284,7 @@ static int selector_ctrl_get_data(struct comp_dev *dev, break; default: - comp_err(dev, "selector_ctrl_get_data(): invalid cdata->cmd"); + comp_err(dev, "invalid cdata->cmd"); ret = -EINVAL; break; } @@ -322,7 +322,7 @@ static int selector_cmd(struct comp_dev *dev, int cmd, void *data, comp_dbg(dev, "selector_cmd(), COMP_CMD_GET_VALUE"); break; default: - comp_err(dev, "selector_cmd(): invalid command"); + comp_err(dev, "invalid command"); ret = -EINVAL; } @@ -444,15 +444,15 @@ static int selector_prepare(struct comp_dev *dev) * proper number of channels [1] for selector to actually * reduce channel count between source and sink */ - comp_dbg(dev, "selector_prepare(): sourceb->schannels = %u", + comp_dbg(dev, "sourceb->schannels = %u", audio_stream_get_channels(&sourceb->stream)); - comp_dbg(dev, "selector_prepare(): sinkb->channels = %u", + comp_dbg(dev, "sinkb->channels = %u", audio_stream_get_channels(&sinkb->stream)); sink_size = audio_stream_get_size(&sinkb->stream); if (sink_size < cd->sink_period_bytes) { - comp_err(dev, "selector_prepare(): sink buffer size %zu is insufficient < %d", + comp_err(dev, "sink buffer size %zu is insufficient < %d", sink_size, cd->sink_period_bytes); ret = -ENOMEM; goto err; @@ -460,14 +460,14 @@ static int selector_prepare(struct comp_dev *dev) /* validate */ if (cd->sink_period_bytes == 0) { - comp_err(dev, "selector_prepare(): cd->sink_period_bytes = 0, dev->frames = %u", + comp_err(dev, "cd->sink_period_bytes = 0, dev->frames = %u", dev->frames); ret = -EINVAL; goto err; } if (cd->source_period_bytes == 0) { - comp_err(dev, "selector_prepare(): cd->source_period_bytes = 0, dev->frames = %u", + comp_err(dev, "cd->source_period_bytes = 0, dev->frames = %u", dev->frames); ret = -EINVAL; goto err; @@ -475,7 +475,7 @@ static int selector_prepare(struct comp_dev *dev) cd->sel_func = sel_get_processing_function(dev); if (!cd->sel_func) { - comp_err(dev, "selector_prepare(): invalid cd->sel_func, cd->source_format = %u, cd->sink_format = %u, cd->out_channels_count = %u", + comp_err(dev, "invalid cd->sel_func, cd->source_format = %u, cd->sink_format = %u, cd->out_channels_count = %u", cd->source_format, cd->sink_format, cd->config.out_channels_count); ret = -EINVAL; @@ -603,13 +603,13 @@ static int selector_init(struct processing_module *mod) if (init_cfg_ext->base_cfg_ext.nb_input_pins != SEL_NUM_IN_PIN_FMTS || init_cfg_ext->base_cfg_ext.nb_output_pins != SEL_NUM_OUT_PIN_FMTS) { - comp_err(mod->dev, "selector_init(): Invalid pin configuration"); + comp_err(mod->dev, "Invalid pin configuration"); return -EINVAL; } } else if (cfg->size == base_cfg_size + bs[1]) { payload_fmt = IPC4_SEL_INIT_PAYLOAD_BASE_WITH_OUT_FMT; } else { - comp_err(mod->dev, "selector_init(): Invalid configuration size"); + comp_err(mod->dev, "Invalid configuration size"); return -EINVAL; } @@ -696,13 +696,13 @@ static int selector_verify_params(struct processing_module *mod, /* verify input channels */ if (in_channels == 0 || in_channels > SEL_SOURCE_CHANNELS_MAX) { - comp_err(dev, "selector_verify_params(): in_channels = %u", in_channels); + comp_err(dev, "in_channels = %u", in_channels); return -EINVAL; } /* verify output channels */ if (out_channels == 0 || out_channels > SEL_SINK_CHANNELS_MAX) { - comp_err(dev, "selector_verify_params(): out_channels = %u", out_channels); + comp_err(dev, "out_channels = %u", out_channels); return -EINVAL; } @@ -756,7 +756,7 @@ static int selector_params(struct processing_module *mod) err = selector_verify_params(mod, params); if (err < 0) { - comp_err(mod->dev, "selector_params(): pcm params verification failed."); + comp_err(mod->dev, "pcm params verification failed."); return -EINVAL; } @@ -855,7 +855,7 @@ static int selector_prepare(struct processing_module *mod, * proper number of channels [1] for selector to actually * reduce channel count between source and sink */ - comp_info(dev, "selector_prepare(): source sink channel = %u %u", + comp_info(dev, "source sink channel = %u %u", audio_stream_get_channels(&sourceb->stream), audio_stream_get_channels(&sinkb->stream)); @@ -865,27 +865,27 @@ static int selector_prepare(struct processing_module *mod, md->mpd.out_buff_size = cd->sink_period_bytes; if (sink_size < cd->sink_period_bytes) { - comp_err(dev, "selector_prepare(): sink buffer size %d is insufficient < %d", + comp_err(dev, "sink buffer size %d is insufficient < %d", sink_size, cd->sink_period_bytes); return -ENOMEM; } /* validate */ if (cd->sink_period_bytes == 0) { - comp_err(dev, "selector_prepare(): cd->sink_period_bytes = 0, dev->frames = %u", + comp_err(dev, "cd->sink_period_bytes = 0, dev->frames = %u", dev->frames); return -EINVAL; } if (cd->source_period_bytes == 0) { - comp_err(dev, "selector_prepare(): cd->source_period_bytes = 0, dev->frames = %u", + comp_err(dev, "cd->source_period_bytes = 0, dev->frames = %u", dev->frames); return -EINVAL; } cd->sel_func = sel_get_processing_function(mod); if (!cd->sel_func) { - comp_err(dev, "selector_prepare(): invalid cd->sel_func, cd->source_format = %u, cd->sink_format = %u, cd->out_channels_count = %u", + comp_err(dev, "invalid cd->sel_func, cd->source_format = %u, cd->sink_format = %u, cd->out_channels_count = %u", cd->source_format, cd->sink_format, cd->config.out_channels_count); return -EINVAL; diff --git a/src/audio/smart_amp/smart_amp.c b/src/audio/smart_amp/smart_amp.c index db17bd8d571d..f7ed81d25b8a 100644 --- a/src/audio/smart_amp/smart_amp.c +++ b/src/audio/smart_amp/smart_amp.c @@ -164,7 +164,7 @@ static int smart_amp_alloc_data_buffers(struct comp_dev *dev, goto error; total_size += size; - comp_dbg(dev, "smart_amp_alloc(): used data buffer %zu bytes", total_size); + comp_dbg(dev, "used data buffer %zu bytes", total_size); return 0; error: @@ -202,7 +202,7 @@ static struct comp_dev *smart_amp_new(const struct comp_driver *drv, bs = ipc_sa->size; if (bs > 0 && bs < sizeof(struct sof_smart_amp_config)) { - comp_err(dev, "smart_amp_new(): failed to apply config"); + comp_err(dev, "failed to apply config"); goto error; } @@ -211,47 +211,47 @@ static struct comp_dev *smart_amp_new(const struct comp_driver *drv, /* allocate inner model data struct */ sad->mod_data = mod_data_create(dev); if (!sad->mod_data) { - comp_err(dev, "smart_amp_new(): failed to allocate nner model data"); + comp_err(dev, "failed to allocate nner model data"); goto error; } /* allocate stream buffers for mod */ ret = smart_amp_alloc_data_buffers(dev, sad); if (ret) { - comp_err(dev, "smart_amp_new(): failed to allocate data buffers, ret:%d", ret); + comp_err(dev, "failed to allocate data buffers, ret:%d", ret); goto error; } /* (before init) allocate mem block for mod private data usage */ ret = smart_amp_alloc_mod_memblk(sad, MOD_MEMBLK_PRIVATE); if (ret < 0) { - comp_err(dev, "smart_amp_new(): failed to allocate mod private, ret:%d", ret); + comp_err(dev, "failed to allocate mod private, ret:%d", ret); goto error; } - comp_dbg(dev, "smart_amp_new(): used mod private buffer %d bytes", ret); + comp_dbg(dev, "used mod private buffer %d bytes", ret); /* init model */ ret = sad->mod_data->mod_ops->init(sad->mod_data); if (ret) { - comp_err(dev, "smart_amp_new(): failed to init inner model, ret:%d", ret); + comp_err(dev, "failed to init inner model, ret:%d", ret); goto error; } /* (after init) allocate mem block for mod audio frame data usage */ ret = smart_amp_alloc_mod_memblk(sad, MOD_MEMBLK_FRAME); if (ret < 0) { - comp_err(dev, "smart_amp_new(): failed to allocate mod buffer, ret:%d", ret); + comp_err(dev, "failed to allocate mod buffer, ret:%d", ret); goto error; } - comp_dbg(dev, "smart_amp_new(): used mod data buffer %d bytes", ret); + comp_dbg(dev, "used mod data buffer %d bytes", ret); /* (after init) allocate mem block for mod parameter blob usage */ ret = smart_amp_alloc_mod_memblk(sad, MOD_MEMBLK_PARAM); if (ret < 0) { - comp_err(dev, "smart_amp_new(): failed to allocate mod config, ret:%d", ret); + comp_err(dev, "failed to allocate mod config, ret:%d", ret); goto error; } - comp_dbg(dev, "smart_amp_new(): used mod config buffer %d bytes", ret); + comp_dbg(dev, "used mod config buffer %d bytes", ret); dev->state = COMP_STATE_READY; @@ -280,7 +280,7 @@ static int smart_amp_set_config(struct comp_dev *dev, bs, sizeof(struct sof_smart_amp_config)); if (bs != sizeof(struct sof_smart_amp_config)) { - comp_err(dev, "smart_amp_set_config(): invalid blob size, actual blob size = %zu, expected blob size = %zu", + comp_err(dev, "invalid blob size, actual blob size = %zu, expected blob size = %zu", bs, sizeof(struct sof_smart_amp_config)); return -EINVAL; } @@ -335,12 +335,12 @@ static int smart_amp_ctrl_get_bin_data(struct comp_dev *dev, case SOF_SMART_AMP_MODEL: ret = mod->mod_ops->get_config(mod, cdata, size); if (ret < 0) { - comp_err(dev, "smart_amp_ctrl_get_bin_data(): failed to read inner model!"); + comp_err(dev, "failed to read inner model!"); return ret; } break; default: - comp_err(dev, "smart_amp_ctrl_get_bin_data(): unknown binary data type"); + comp_err(dev, "unknown binary data type"); break; } @@ -359,7 +359,7 @@ static int smart_amp_ctrl_get_data(struct comp_dev *dev, ret = smart_amp_ctrl_get_bin_data(dev, cdata, size); break; default: - comp_err(dev, "smart_amp_ctrl_get_data(): invalid cdata->cmd"); + comp_err(dev, "invalid cdata->cmd"); return -EINVAL; } @@ -377,7 +377,7 @@ static int smart_amp_ctrl_set_bin_data(struct comp_dev *dev, mod = sad->mod_data; if (dev->state < COMP_STATE_READY) { - comp_err(dev, "smart_amp_ctrl_set_bin_data(): driver in init!"); + comp_err(dev, "driver in init!"); return -EBUSY; } @@ -388,12 +388,12 @@ static int smart_amp_ctrl_set_bin_data(struct comp_dev *dev, case SOF_SMART_AMP_MODEL: ret = mod->mod_ops->set_config(mod, cdata); if (ret < 0) { - comp_err(dev, "smart_amp_ctrl_set_bin_data(): failed to write inner model!"); + comp_err(dev, "failed to write inner model!"); return ret; } break; default: - comp_err(dev, "smart_amp_ctrl_set_bin_data(): unknown binary data type"); + comp_err(dev, "unknown binary data type"); break; } @@ -407,7 +407,7 @@ static int smart_amp_ctrl_set_data(struct comp_dev *dev, /* Check version from ABI header */ if (SOF_ABI_VERSION_INCOMPATIBLE(SOF_ABI_VERSION, cdata->data->abi)) { - comp_err(dev, "smart_amp_ctrl_set_data(): invalid version"); + comp_err(dev, "invalid version"); return -EINVAL; } @@ -417,7 +417,7 @@ static int smart_amp_ctrl_set_data(struct comp_dev *dev, ret = smart_amp_ctrl_set_bin_data(dev, cdata); break; default: - comp_err(dev, "smart_amp_ctrl_set_data(): invalid cdata->cmd"); + comp_err(dev, "invalid cdata->cmd"); ret = -EINVAL; break; } @@ -431,7 +431,7 @@ static int smart_amp_cmd(struct comp_dev *dev, int cmd, void *data, { struct sof_ipc_ctrl_data *cdata = ASSUME_ALIGNED(data, 4); - comp_dbg(dev, "smart_amp_cmd(): cmd: %d", cmd); + comp_dbg(dev, "cmd: %d", cmd); switch (cmd) { case COMP_CMD_SET_DATA: @@ -483,7 +483,7 @@ static int smart_amp_params(struct comp_dev *dev, err = smart_amp_verify_params(dev, params); if (err < 0) { - comp_err(dev, "smart_amp_params(): pcm params verification failed."); + comp_err(dev, "pcm params verification failed."); return -EINVAL; } @@ -529,12 +529,12 @@ static int smart_amp_ff_process(struct comp_dev *dev, sad->out_mod.produced = 0; if (frames == 0) { - comp_warn(dev, "smart_amp_copy(): feed forward frame size zero warning."); + comp_warn(dev, "feed forward frame size zero warning."); return 0; } if (frames > SMART_AMP_FF_BUF_DB_SZ) { - comp_err(dev, "smart_amp_copy(): feed forward frame size overflow: %u", frames); + comp_err(dev, "feed forward frame size overflow: %u", frames); sad->ff_mod.consumed = frames; return -EINVAL; } @@ -543,7 +543,7 @@ static int smart_amp_ff_process(struct comp_dev *dev, ret = mod->mod_ops->ff_proc(mod, frames, &sad->ff_mod, &sad->out_mod); if (ret) { - comp_err(dev, "smart_amp_copy(): feed forward inner model process error"); + comp_err(dev, "feed forward inner model process error"); return ret; } @@ -563,12 +563,12 @@ static int smart_amp_fb_process(struct comp_dev *dev, sad->fb_mod.consumed = 0; if (frames == 0) { - comp_warn(dev, "smart_amp_copy(): feedback frame size zero warning."); + comp_warn(dev, "feedback frame size zero warning."); return 0; } if (frames > SMART_AMP_FB_BUF_DB_SZ) { - comp_err(dev, "smart_amp_copy(): feedback frame size overflow: %u", frames); + comp_err(dev, "feedback frame size overflow: %u", frames); sad->fb_mod.consumed = frames; return -EINVAL; } @@ -577,7 +577,7 @@ static int smart_amp_fb_process(struct comp_dev *dev, ret = mod->mod_ops->fb_proc(mod, frames, &sad->fb_mod); if (ret) { - comp_err(dev, "smart_amp_copy(): feedback inner model process error"); + comp_err(dev, "feedback inner model process error"); return ret; } @@ -618,7 +618,7 @@ static int smart_amp_copy(struct comp_dev *dev) feedback_bytes = avail_feedback_frames * audio_stream_frame_bytes(&feedback_buf->stream); - comp_dbg(dev, "smart_amp_copy(): processing %u feedback frames (avail_passthrough_frames: %u)", + comp_dbg(dev, "processing %u feedback frames (avail_passthrough_frames: %u)", avail_feedback_frames, avail_passthrough_frames); /* perform buffer writeback after source_buf process */ @@ -627,7 +627,7 @@ static int smart_amp_copy(struct comp_dev *dev) avail_feedback_frames, sad->config.feedback_ch_map); - comp_dbg(dev, "smart_amp_copy(): consumed %u feedback frames", + comp_dbg(dev, "consumed %u feedback frames", sad->fb_mod.consumed); if (sad->fb_mod.consumed < avail_feedback_frames) { feedback_bytes = sad->fb_mod.consumed * @@ -645,7 +645,7 @@ static int smart_amp_copy(struct comp_dev *dev) smart_amp_ff_process(dev, &source_buf->stream, &sink_buf->stream, avail_frames, sad->config.source_ch_map); - comp_dbg(dev, "smart_amp_copy(): processing %u feed forward frames (consumed: %u, produced: %u)", + comp_dbg(dev, "processing %u feed forward frames (consumed: %u, produced: %u)", avail_frames, sad->ff_mod.consumed, sad->out_mod.produced); if (sad->ff_mod.consumed < avail_frames) source_bytes = sad->ff_mod.consumed * audio_stream_frame_bytes(&source_buf->stream); @@ -702,7 +702,7 @@ static int smart_amp_resolve_mod_fmt(struct comp_dev *dev, uint32_t least_req_de /* get supported formats from mod */ ret = mod->mod_ops->get_supported_fmts(mod, &mod_fmts, &num_mod_fmts); if (ret) { - comp_err(dev, "smart_amp_resolve_mod_fmt(): failed to get supported formats"); + comp_err(dev, "failed to get supported formats"); return ret; } @@ -710,12 +710,12 @@ static int smart_amp_resolve_mod_fmt(struct comp_dev *dev, uint32_t least_req_de if (get_sample_bitdepth(mod_fmts[i]) >= least_req_depth && is_supported_fmt(mod_fmts[i])) { /* set frame format to inner model */ - comp_dbg(dev, "smart_amp_resolve_mod_fmt(): set mod format to %u", + comp_dbg(dev, "set mod format to %u", mod_fmts[i]); ret = mod->mod_ops->set_fmt(mod, mod_fmts[i]); if (ret) { comp_err(dev, - "smart_amp_resolve_mod_fmt(): failed setting format %u", + "failed setting format %u", mod_fmts[i]); return ret; } @@ -724,7 +724,7 @@ static int smart_amp_resolve_mod_fmt(struct comp_dev *dev, uint32_t least_req_de } } - comp_err(dev, "smart_amp_resolve_mod_fmt(): failed to resolve the frame format for mod"); + comp_err(dev, "failed to resolve the frame format for mod"); return -EINVAL; } @@ -798,15 +798,15 @@ static int smart_amp_prepare(struct comp_dev *dev) sad->out_mod.frame_fmt = resolved_mod_fmt; sad->ff_get_frame = smart_amp_get_src_func(ff_src_fmt, sad->ff_mod.frame_fmt); sad->ff_set_frame = smart_amp_get_sink_func(ff_src_fmt, sad->out_mod.frame_fmt); - comp_dbg(dev, "smart_amp_prepare(): ff mod buffer channels:%u fmt_conv:%u -> %u", + comp_dbg(dev, "ff mod buffer channels:%u fmt_conv:%u -> %u", sad->ff_mod.channels, ff_src_fmt, sad->ff_mod.frame_fmt); - comp_dbg(dev, "smart_amp_prepare(): output mod buffer channels:%u fmt_conv:%u -> %u", + comp_dbg(dev, "output mod buffer channels:%u fmt_conv:%u -> %u", sad->out_mod.channels, sad->out_mod.frame_fmt, ff_src_fmt); if (sad->feedback_buf) { sad->fb_mod.frame_fmt = resolved_mod_fmt; sad->fb_get_frame = smart_amp_get_src_func(fb_src_fmt, sad->fb_mod.frame_fmt); - comp_dbg(dev, "smart_amp_prepare(): fb mod buffer channels:%u fmt_conv:%u -> %u", + comp_dbg(dev, "fb mod buffer channels:%u fmt_conv:%u -> %u", sad->fb_mod.channels, fb_src_fmt, sad->fb_mod.frame_fmt); } return 0; diff --git a/src/audio/src/src_common.c b/src/audio/src/src_common.c index 120077f5763b..960836858b47 100644 --- a/src/audio/src/src_common.c +++ b/src/audio/src/src_common.c @@ -61,7 +61,7 @@ static int src_buffer_lengths(struct comp_dev *dev, struct comp_data *cd, int nc if (nch > PLATFORM_MAX_CHANNELS) { /* TODO: should be device, not class */ - comp_err(dev, "src_buffer_lengths(): nch = %u > PLATFORM_MAX_CHANNELS", + comp_err(dev, "nch = %u > PLATFORM_MAX_CHANNELS", nch); return -EINVAL; } @@ -73,7 +73,7 @@ static int src_buffer_lengths(struct comp_dev *dev, struct comp_data *cd, int nc /* Check from stage1 parameter for a deleted in/out rate combination.*/ if (stage1->filter_length < 1) { - comp_err(dev, "src_buffer_lengths(): Non-supported combination sfs_in = %d, fs_out = %d", + comp_err(dev, "Non-supported combination sfs_in = %d, fs_out = %d", fs_in, fs_out); return -EINVAL; } @@ -410,13 +410,13 @@ static int src_verify_params(struct processing_module *mod) if (dev->direction == SOF_IPC_STREAM_PLAYBACK) { ret = src_stream_pcm_sink_rate_check(cd->ipc_config, params); if (ret < 0) { - comp_err(dev, "src_verify_params(): sink stream rate does not match rate fetched from ipc."); + comp_err(dev, "sink stream rate does not match rate fetched from ipc."); return ret; } } else { ret = src_stream_pcm_source_rate_check(cd->ipc_config, params); if (ret < 0) { - comp_err(dev, "src_verify_params(): source stream rate does not match rate fetched from ipc."); + comp_err(dev, "source stream rate does not match rate fetched from ipc."); return ret; } } @@ -425,7 +425,7 @@ static int src_verify_params(struct processing_module *mod) */ ret = comp_verify_params(dev, BUFF_PARAMS_RATE, params); if (ret < 0) - comp_err(dev, "src_verify_params(): comp_verify_params() failed."); + comp_err(dev, "comp_verify_params() failed."); return ret; } @@ -489,13 +489,13 @@ int src_params_general(struct processing_module *mod, err = src_set_params(mod, sink); if (err < 0) { - comp_err(dev, "src_params(): set params failed."); + comp_err(dev, "set params failed."); return err; } err = src_verify_params(mod); if (err < 0) { - comp_err(dev, "src_params(): pcm params verification failed."); + comp_err(dev, "pcm params verification failed."); return err; } @@ -514,7 +514,7 @@ int src_params_general(struct processing_module *mod, /* Allocate needed memory for delay lines */ err = src_buffer_lengths(dev, cd, cd->channels_count); if (err < 0) { - comp_err(dev, "src_params(): src_buffer_lengths() failed"); + comp_err(dev, "src_buffer_lengths() failed"); return err; } @@ -525,7 +525,7 @@ int src_params_general(struct processing_module *mod, */ delay_lines_size = ALIGN_UP(sizeof(int32_t) * cd->param.total, 8); if (delay_lines_size == 0) { - comp_err(dev, "src_params(): delay_lines_size = 0"); + comp_err(dev, "delay_lines_size = 0"); return -EINVAL; } @@ -535,7 +535,7 @@ int src_params_general(struct processing_module *mod, cd->delay_lines = rballoc(SOF_MEM_FLAG_USER, delay_lines_size); if (!cd->delay_lines) { - comp_err(dev, "src_params(): failed to alloc cd->delay_lines, delay_lines_size = %zu", + comp_err(dev, "failed to alloc cd->delay_lines, delay_lines_size = %zu", delay_lines_size); return -EINVAL; } @@ -586,7 +586,7 @@ int src_param_set(struct comp_dev *dev, struct comp_data *cd) /* Check that both in and out rates are supported */ if (a->idx_in < 0 || a->idx_out < 0) { - comp_err(dev, "src_buffer_lengths(): rates not supported, fs_in: %u, fs_out: %u", + comp_err(dev, "rates not supported, fs_in: %u, fs_out: %u", fs_in, fs_out); return -EINVAL; } diff --git a/src/audio/src/src_ipc3.c b/src/audio/src/src_ipc3.c index 93b0348ba462..c4167193e5e3 100644 --- a/src/audio/src/src_ipc3.c +++ b/src/audio/src/src_ipc3.c @@ -113,7 +113,7 @@ int src_prepare_general(struct processing_module *mod, /* SRC supports S16_LE, S24_4LE and S32_LE formats */ if (source_format != sink_format) { - comp_err(dev, "src_prepare(): Source fmt %d and sink fmt %d are different.", + comp_err(dev, "Source fmt %d and sink fmt %d are different.", source_format, sink_format); ret = -EINVAL; goto out; @@ -139,7 +139,7 @@ int src_prepare_general(struct processing_module *mod, break; #endif /* CONFIG_FORMAT_S32LE */ default: - comp_err(dev, "src_prepare(): invalid format %d", source_format); + comp_err(dev, "invalid format %d", source_format); ret = -EINVAL; goto out; } @@ -161,20 +161,20 @@ int src_init(struct processing_module *mod) comp_dbg(dev, "src_init()"); if (dev->ipc_config.type != SOF_COMP_SRC) { - comp_err(dev, "src_init(): Wrong IPC config type %u", + comp_err(dev, "Wrong IPC config type %u", dev->ipc_config.type); return -EINVAL; } if (!cfg->init_data || cfg->size != sizeof(cd->ipc_config)) { - comp_err(dev, "src_init(): Missing or bad size (%zu) init data", + comp_err(dev, "Missing or bad size (%zu) init data", cfg->size); return -EINVAL; } /* validate init data - either SRC sink or source rate must be set */ if (src_rate_check(cfg->init_data) < 0) { - comp_err(dev, "src_init(): SRC sink and source rate are not set"); + comp_err(dev, "SRC sink and source rate are not set"); return -EINVAL; } diff --git a/src/audio/src/src_ipc4.c b/src/audio/src/src_ipc4.c index 76ef1a50175c..36397e4aa214 100644 --- a/src/audio/src/src_ipc4.c +++ b/src/audio/src/src_ipc4.c @@ -173,7 +173,7 @@ int src_prepare_general(struct processing_module *mod, break; #endif /* CONFIG_FORMAT_S32LE */ default: - comp_err(dev, "src_prepare(): Invalid depth %d", + comp_err(dev, "Invalid depth %d", cd->ipc_config.base.audio_fmt.depth); ret = -EINVAL; goto out; @@ -198,14 +198,14 @@ __cold int src_init(struct processing_module *mod) comp_dbg(dev, "src_init()"); if (!cfg->init_data || cfg->size != sizeof(cd->ipc_config)) { - comp_err(dev, "src_init(): Missing or bad size (%u) init data", + comp_err(dev, "Missing or bad size (%u) init data", cfg->size); return -EINVAL; } /* validate init data - either SRC sink or source rate must be set */ if (src_rate_check(cfg->init_data) < 0) { - comp_err(dev, "src_init(): SRC sink and source rate are not set"); + comp_err(dev, "SRC sink and source rate are not set"); return -EINVAL; } @@ -238,7 +238,7 @@ __cold int src_init(struct processing_module *mod) cd->sample_container_bytes = sizeof(int32_t); break; default: - comp_err(dev, "src_init(): Illegal sample depth %d", + comp_err(dev, "Illegal sample depth %d", cd->ipc_config.base.audio_fmt.depth); rfree(cd); return -EINVAL; diff --git a/src/audio/tdfb/tdfb.c b/src/audio/tdfb/tdfb.c index 27136884cfde..e849b1dd0781 100644 --- a/src/audio/tdfb/tdfb.c +++ b/src/audio/tdfb/tdfb.c @@ -576,7 +576,7 @@ static int tdfb_init(struct processing_module *mod) /* Handler for configuration data */ cd->model_handler = comp_data_blob_handler_new(dev); if (!cd->model_handler) { - comp_err(dev, "tdfb_init(): comp_data_blob_handler_new() failed."); + comp_err(dev, "comp_data_blob_handler_new() failed."); ret = -ENOMEM; goto err; } @@ -584,7 +584,7 @@ static int tdfb_init(struct processing_module *mod) /* Get configuration data and reset FIR filters */ ret = comp_init_data_blob(cd->model_handler, bs, cfg->data); if (ret < 0) { - comp_err(dev, "tdfb_init(): comp_init_data_blob() failed."); + comp_err(dev, "comp_init_data_blob() failed."); goto err; } diff --git a/src/audio/tensorflow/tflm-classify.c b/src/audio/tensorflow/tflm-classify.c index 9dafe056110c..d24099757c2d 100644 --- a/src/audio/tensorflow/tflm-classify.c +++ b/src/audio/tensorflow/tflm-classify.c @@ -70,7 +70,7 @@ __cold static int tflm_init(struct processing_module *mod) /* Handler for configuration data */ cd->model_handler = comp_data_blob_handler_new(dev); if (!cd->model_handler) { - comp_err(dev, "tflm_init(): comp_data_blob_handler_new() failed."); + comp_err(dev, "comp_data_blob_handler_new() failed."); ret = -ENOMEM; goto cd_fail; } @@ -78,7 +78,7 @@ __cold static int tflm_init(struct processing_module *mod) /* Get configuration data and reset DRC state */ ret = comp_init_data_blob(cd->model_handler, bs, cfg->data); if (ret < 0) { - comp_err(dev, "tflm_init(): comp_init_data_blob() failed."); + comp_err(dev, "comp_init_data_blob() failed."); goto cd_fail; } @@ -197,7 +197,7 @@ static int tflm_process(struct processing_module *mod, cd->tfc.audio_data_size = TFLM_FEATURE_ELEM_COUNT; ret = TF_ProcessClassify(&cd->tfc); if (!ret) { - comp_err(dev, "tflm_process(): classify failed %s.", + comp_err(dev, "classify failed %s.", cd->tfc.error); return ret; } diff --git a/src/audio/tone.c b/src/audio/tone.c index 0a175b5ed1ee..39c2ad820581 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -462,7 +462,7 @@ static int tone_cmd_get_value(struct comp_dev *dev, comp_info(dev, "tone_cmd_get_value()"); if (cdata->type != SOF_CTRL_TYPE_VALUE_CHAN_GET) { - comp_err(dev, "tone_cmd_get_value(): wrong cdata->type: %u", + comp_err(dev, "wrong cdata->type: %u", cdata->type); return -EINVAL; } @@ -487,7 +487,7 @@ static int tone_cmd_set_value(struct comp_dev *dev, bool val; if (cdata->type != SOF_CTRL_TYPE_VALUE_CHAN_SET) { - comp_err(dev, "tone_cmd_set_value(): wrong cdata->type: %u", + comp_err(dev, "wrong cdata->type: %u", cdata->type); return -EINVAL; } @@ -500,7 +500,7 @@ static int tone_cmd_set_value(struct comp_dev *dev, comp_info(dev, "tone_cmd_set_value(), SOF_CTRL_CMD_SWITCH, ch = %u, val = %u", ch, val); if (ch >= PLATFORM_MAX_CHANNELS) { - comp_err(dev, "tone_cmd_set_value(): ch >= PLATFORM_MAX_CHANNELS"); + comp_err(dev, "ch >= PLATFORM_MAX_CHANNELS"); return -EINVAL; } @@ -510,7 +510,7 @@ static int tone_cmd_set_value(struct comp_dev *dev, tonegen_mute(&cd->sg[ch]); } } else { - comp_err(dev, "tone_cmd_set_value(): invalid cdata->cmd"); + comp_err(dev, "invalid cdata->cmd"); return -EINVAL; } @@ -529,7 +529,7 @@ static int tone_cmd_set_data(struct comp_dev *dev, comp_info(dev, "tone_cmd_set_data()"); if (cdata->type != SOF_CTRL_TYPE_VALUE_COMP_SET) { - comp_err(dev, "tone_cmd_set_data(): wrong cdata->type: %u", + comp_err(dev, "wrong cdata->type: %u", cdata->type); return -EINVAL; } @@ -579,13 +579,13 @@ static int tone_cmd_set_data(struct comp_dev *dev, tonegen_set_linramp(&cd->sg[ch], val); break; default: - comp_err(dev, "tone_cmd_set_data(): invalid cdata->index"); + comp_err(dev, "invalid cdata->index"); return -EINVAL; } } break; default: - comp_err(dev, "tone_cmd_set_data(): invalid cdata->cmd"); + comp_err(dev, "invalid cdata->cmd"); return -EINVAL; } diff --git a/src/audio/up_down_mixer/up_down_mixer.c b/src/audio/up_down_mixer/up_down_mixer.c index acfeb926b666..3cc8308ad62d 100644 --- a/src/audio/up_down_mixer/up_down_mixer.c +++ b/src/audio/up_down_mixer/up_down_mixer.c @@ -100,7 +100,7 @@ static int set_downmix_coefficients(struct processing_module *mod, cd->downmix_coefficients = k_scaled_lo_ro_downmix32bit; break; default: - comp_err(dev, "set_downmix_coefficients(): invalid channel config."); + comp_err(dev, "invalid channel config."); return -EINVAL; } @@ -128,7 +128,7 @@ static up_down_mixer_routine select_mix_out_stereo(struct comp_dev *dev, return downmix16bit_5_1; case IPC4_CHANNEL_CONFIG_INVALID: default: - comp_err(dev, "select_mix_out_stereo(): invalid channel config."); + comp_err(dev, "invalid channel config."); /* * This is a strange situation. We will allow to process it * in the release code (hoping for the best) with downmix16bit, @@ -161,7 +161,7 @@ static up_down_mixer_routine select_mix_out_stereo(struct comp_dev *dev, return downmix32bit_7_1; case IPC4_CHANNEL_CONFIG_INVALID: default: - comp_err(dev, "select_mix_out_stereo(): invalid channel config."); + comp_err(dev, "invalid channel config."); /* * This is a strange situation. We will allow to process it * in the release code (hoping for the best) with downmix32bit, @@ -185,7 +185,7 @@ static up_down_mixer_routine select_mix_out_mono(struct comp_dev *dev, return downmix16bit_4ch_mono; case IPC4_CHANNEL_CONFIG_INVALID: default: - comp_err(dev, "select_mix_out_mono(): invalid channel config."); + comp_err(dev, "invalid channel config."); /* * This is a strange situation. We will allow to process it * in the release code (hoping for the best) with downmix16bit, @@ -212,7 +212,7 @@ static up_down_mixer_routine select_mix_out_mono(struct comp_dev *dev, return downmix32bit_7_1_mono; case IPC4_CHANNEL_CONFIG_INVALID: default: - comp_err(dev, "select_mix_out_mono(): invalid channel config."); + comp_err(dev, "invalid channel config."); /* * This is a strange situation. We will allow to process it * in the release code (hoping for the best) with downmix32bit, @@ -234,7 +234,7 @@ static up_down_mixer_routine select_mix_out_5_1(struct comp_dev *dev, return upmix16bit_2_0_to_5_1; case IPC4_CHANNEL_CONFIG_INVALID: default: - comp_err(dev, "select_mix_out_5_1(): invalid channel config."); + comp_err(dev, "invalid channel config."); return NULL; } } else { @@ -251,7 +251,7 @@ static up_down_mixer_routine select_mix_out_5_1(struct comp_dev *dev, return downmix32bit_7_1_to_5_1; case IPC4_CHANNEL_CONFIG_INVALID: default: - comp_err(dev, "select_mix_out_5_1(): invalid channel config."); + comp_err(dev, "invalid channel config."); return NULL; } } @@ -379,13 +379,13 @@ static int up_down_mixer_init(struct processing_module *mod) up_down_mixer->out_channel_config, up_down_mixer->coefficients); break; default: - comp_err(dev, "up_down_mixer_init(): unsupported coefficient type"); + comp_err(dev, "unsupported coefficient type"); ret = -EINVAL; break; } if (ret < 0) { - comp_err(dev, "up_down_mixer_init(): failed to initialize up_down_mix"); + comp_err(dev, "failed to initialize up_down_mix"); goto err; } diff --git a/src/audio/volume/volume.c b/src/audio/volume/volume.c index 4b168b7fa1c0..50aa4a4750d5 100644 --- a/src/audio/volume/volume.c +++ b/src/audio/volume/volume.c @@ -690,7 +690,7 @@ static int volume_prepare(struct processing_module *mod, dev->frames); if (audio_stream_get_size(&sinkb->stream) < sink_period_bytes) { - comp_err(dev, "volume_prepare(): sink buffer size %d is insufficient < %d", + comp_err(dev, "sink buffer size %d is insufficient < %d", audio_stream_get_size(&sinkb->stream), sink_period_bytes); ret = -ENOMEM; goto err; @@ -699,7 +699,7 @@ static int volume_prepare(struct processing_module *mod, set_volume_process(cd, dev, false); if (!cd->scale_vol) { - comp_err(dev, "volume_prepare(): invalid cd->scale_vol"); + comp_err(dev, "invalid cd->scale_vol"); ret = -EINVAL; goto err; @@ -707,7 +707,7 @@ static int volume_prepare(struct processing_module *mod, cd->zc_get = vol_get_zc_function(dev, sinkb); if (!cd->zc_get) { - comp_err(dev, "volume_prepare(): invalid cd->zc_get"); + comp_err(dev, "invalid cd->zc_get"); ret = -EINVAL; goto err; } diff --git a/src/audio/volume/volume.h b/src/audio/volume/volume.h index ae3cd32e63f4..7e7c41ea00d7 100644 --- a/src/audio/volume/volume.h +++ b/src/audio/volume/volume.h @@ -264,7 +264,7 @@ static inline vol_scale_func vol_get_processing_function(struct comp_dev *dev, case IPC4_DEPTH_32BIT: return volume_func_map[2].passthrough_func; default: - comp_err(dev, "vol_get_processing_function(): unsupported depth %d", + comp_err(dev, "unsupported depth %d", mod->priv.cfg.base_cfg.audio_fmt.depth); return NULL; } @@ -277,7 +277,7 @@ static inline vol_scale_func vol_get_processing_function(struct comp_dev *dev, case IPC4_DEPTH_32BIT: return volume_func_map[2].func; default: - comp_err(dev, "vol_get_processing_function(): unsupported depth %d", + comp_err(dev, "unsupported depth %d", mod->priv.cfg.base_cfg.audio_fmt.depth); return NULL; } diff --git a/src/audio/volume/volume_ipc3.c b/src/audio/volume/volume_ipc3.c index 2b5adefbf067..e83ebf25cff1 100644 --- a/src/audio/volume/volume_ipc3.c +++ b/src/audio/volume/volume_ipc3.c @@ -76,7 +76,7 @@ int volume_init(struct processing_module *mod) int i; if (!vol || cfg->size != sizeof(*vol)) { - comp_err(dev, "volume_init(): No configuration data or bad data size %zu", + comp_err(dev, "No configuration data or bad data size %zu", cfg->size); return -EINVAL; } @@ -92,7 +92,7 @@ int volume_init(struct processing_module *mod) cd->vol = rmalloc(SOF_MEM_FLAG_USER, vol_size); if (!cd->vol) { rfree(cd); - comp_err(dev, "volume_init(): Failed to allocate %zu", vol_size); + comp_err(dev, "Failed to allocate %zu", vol_size); return -ENOMEM; } @@ -108,7 +108,7 @@ int volume_init(struct processing_module *mod) if (vol->min_value < VOL_MIN) { /* Use VOL_MIN instead, no need to stop new(). */ cd->vol_min = VOL_MIN; - comp_err(dev, "volume_new(): vol->min_value was limited to VOL_MIN."); + comp_err(dev, "vol->min_value was limited to VOL_MIN."); } else { cd->vol_min = vol->min_value; } @@ -116,7 +116,7 @@ int volume_init(struct processing_module *mod) if (vol->max_value > VOL_MAX) { /* Use VOL_MAX instead, no need to stop new(). */ cd->vol_max = VOL_MAX; - comp_err(dev, "volume_new(): vol->max_value was limited to VOL_MAX."); + comp_err(dev, "vol->max_value was limited to VOL_MAX."); } else { cd->vol_max = vol->max_value; } @@ -157,7 +157,7 @@ int volume_init(struct processing_module *mod) cd->initial_ramp = vol->initial_ramp; break; default: - comp_err(dev, "volume_new(): invalid ramp type %d", vol->ramp); + comp_err(dev, "invalid ramp type %d", vol->ramp); rfree(cd); rfree(cd->vol); return -EINVAL; @@ -189,7 +189,7 @@ int volume_set_config(struct processing_module *mod, uint32_t config_id, /* validate */ if (cdata->num_elems == 0 || cdata->num_elems > SOF_IPC_MAX_CHANNELS) { - comp_err(dev, "volume_set_config(): invalid cdata->num_elems"); + comp_err(dev, "invalid cdata->num_elems"); return -EINVAL; } @@ -246,7 +246,7 @@ int volume_set_config(struct processing_module *mod, uint32_t config_id, break; default: - comp_err(dev, "volume_set_config(): invalid cdata->cmd"); + comp_err(dev, "invalid cdata->cmd"); return -EINVAL; } @@ -266,7 +266,7 @@ int volume_get_config(struct processing_module *mod, /* validate */ if (cdata->num_elems == 0 || cdata->num_elems > SOF_IPC_MAX_CHANNELS) { - comp_err(dev, "volume_get_config(): invalid cdata->num_elems %u", + comp_err(dev, "invalid cdata->num_elems %u", cdata->num_elems); return -EINVAL; } @@ -291,7 +291,7 @@ int volume_get_config(struct processing_module *mod, } break; default: - comp_err(dev, "volume_get_config(): invalid cdata->cmd"); + comp_err(dev, "invalid cdata->cmd"); return -EINVAL; } diff --git a/src/audio/volume/volume_ipc4.c b/src/audio/volume/volume_ipc4.c index 39f343b004cc..889008657e8e 100644 --- a/src/audio/volume/volume_ipc4.c +++ b/src/audio/volume/volume_ipc4.c @@ -124,7 +124,7 @@ int volume_init(struct processing_module *mod) } channels_count = mod->priv.cfg.base_cfg.audio_fmt.channels_count; if (channels_count > SOF_IPC_MAX_CHANNELS || !channels_count) { - comp_err(dev, "volume_init(): Invalid channels count %u", channels_count); + comp_err(dev, "Invalid channels count %u", channels_count); return -EINVAL; } @@ -139,7 +139,7 @@ int volume_init(struct processing_module *mod) cd->vol = rmalloc(SOF_MEM_FLAG_USER, vol_size); if (!cd->vol) { rfree(cd); - comp_err(dev, "volume_init(): Failed to allocate %d", vol_size); + comp_err(dev, "Failed to allocate %d", vol_size); return -ENOMEM; } @@ -150,7 +150,7 @@ int volume_init(struct processing_module *mod) if (!cd->peak_vol) { rfree(cd->vol); rfree(cd); - comp_err(dev, "volume_init(): Failed to allocate %d for peak_vol", vol_size); + comp_err(dev, "Failed to allocate %d for peak_vol", vol_size); return -ENOMEM; }