Skip to content

Commit 58ac6c9

Browse files
lyakhkv2019i
lyakh
authored and
kv2019i
committed
tree-wide: remove function names from logs
Remove function names from logging calls. They're added automatically by Zephyr. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent d213499 commit 58ac6c9

File tree

27 files changed

+195
-195
lines changed

27 files changed

+195
-195
lines changed

‎src/ipc/ipc-helper.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ int ipc_pipeline_complete(struct ipc *ipc, uint32_t comp_id)
235235
/* check whether pipeline exists */
236236
ipc_pipe = ipc_get_pipeline_by_id(ipc, comp_id);
237237
if (!ipc_pipe) {
238-
tr_err(&ipc_tr, "ipc: ipc_pipeline_complete looking for pipe component id 0x%x failed",
238+
tr_err(&ipc_tr, "ipc: looking for pipe component id 0x%x failed",
239239
comp_id);
240240
return -EINVAL;
241241
}
@@ -249,14 +249,14 @@ int ipc_pipeline_complete(struct ipc *ipc, uint32_t comp_id)
249249
/* get pipeline source component */
250250
ipc_ppl_source = ipc_get_ppl_src_comp(ipc, p->pipeline_id);
251251
if (!ipc_ppl_source) {
252-
tr_err(&ipc_tr, "ipc: ipc_pipeline_complete looking for pipeline source failed");
252+
tr_err(&ipc_tr, "ipc: looking for pipeline source failed");
253253
return -EINVAL;
254254
}
255255

256256
/* get pipeline sink component */
257257
ipc_ppl_sink = ipc_get_ppl_sink_comp(ipc, p->pipeline_id);
258258
if (!ipc_ppl_sink) {
259-
tr_err(&ipc_tr, "ipc: ipc_pipeline_complete looking for pipeline sink failed");
259+
tr_err(&ipc_tr, "ipc: looking for pipeline sink failed");
260260
return -EINVAL;
261261
}
262262

‎src/ipc/ipc3/dai.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ int ipc_comp_dai_config(struct ipc *ipc, struct ipc_config_dai *common_config,
215215
int ret = -ENODEV;
216216
int i;
217217

218-
tr_info(&ipc_tr, "ipc_comp_dai_config() dai type = %d index = %d",
218+
tr_info(&ipc_tr, "dai type = %d index = %d",
219219
config->type, config->dai_index);
220220

221221
/* for each component */
@@ -310,7 +310,7 @@ int dai_config(struct dai_data *dd, struct comp_dev *dev, struct ipc_config_dai
310310
dd->ipc_config.type != config->type)
311311
return 0;
312312

313-
comp_info(dev, "dai_config() dai type = %d index = %d dd %p",
313+
comp_info(dev, "dai type = %d index = %d dd %p",
314314
config->type, config->dai_index, dd);
315315

316316
/* cannot configure DAI while active */
@@ -379,7 +379,7 @@ int dai_config(struct dai_data *dd, struct comp_dev *dev, struct ipc_config_dai
379379
dd->dai_spec_config = rzalloc(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT,
380380
sizeof(struct sof_ipc_dai_config));
381381
if (!dd->dai_spec_config) {
382-
comp_err(dev, "No memory for dai_config.");
382+
comp_err(dev, "No memory");
383383
return -ENOMEM;
384384
}
385385
}

‎src/ipc/ipc3/handler.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ static int ipc_dma_trace_config(uint32_t header)
829829

830830
if (!dmat) {
831831
mtrace_printf(LOG_LEVEL_ERROR,
832-
"ipc_dma_trace_config failed: dmat not initialized");
832+
"failed: dmat not initialized");
833833
return -ENOMEM;
834834
}
835835

‎src/ipc/ipc4/dai.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ __cold int dai_config(struct dai_data *dd, struct comp_dev *dev,
342342
dd->ipc_config.type != common_config->type)
343343
return 0;
344344

345-
comp_info(dev, "dai_config() dai type = %d index = %d dd %p",
345+
comp_info(dev, "dai type = %d index = %d dd %p",
346346
common_config->type, common_config->dai_index, dd);
347347

348348
/* cannot configure DAI while active */
@@ -376,7 +376,7 @@ __cold int dai_config(struct dai_data *dd, struct comp_dev *dev,
376376
size = sizeof(*copier_cfg);
377377
dd->dai_spec_config = rzalloc(SOF_MEM_FLAG_USER, size);
378378
if (!dd->dai_spec_config) {
379-
comp_err(dev, "No memory for dai_config size %d", size);
379+
comp_err(dev, "No memory for size %d", size);
380380
return -ENOMEM;
381381
}
382382

‎src/ipc/ipc4/handler.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ __cold static int ipc4_init_module_instance(struct ipc4_message_request *ipc4)
881881
return IPC4_FAILURE;
882882

883883
tr_dbg(&ipc_tr,
884-
"ipc4_init_module_instance %x : %x",
884+
"%x : %x",
885885
(uint32_t)module_init.primary.r.module_id,
886886
(uint32_t)module_init.primary.r.instance_id);
887887

@@ -912,7 +912,7 @@ __cold static int ipc4_bind_module_instance(struct ipc4_message_request *ipc4)
912912
if (ret < 0)
913913
return IPC4_FAILURE;
914914

915-
tr_dbg(&ipc_tr, "ipc4_bind_module_instance %x : %x with %x : %x",
915+
tr_dbg(&ipc_tr, "%x : %x with %x : %x",
916916
(uint32_t)bu.primary.r.module_id, (uint32_t)bu.primary.r.instance_id,
917917
(uint32_t)bu.extension.r.dst_module_id, (uint32_t)bu.extension.r.dst_instance_id);
918918

@@ -931,7 +931,7 @@ __cold static int ipc4_unbind_module_instance(struct ipc4_message_request *ipc4)
931931
if (ret < 0)
932932
return IPC4_FAILURE;
933933

934-
tr_dbg(&ipc_tr, "ipc4_unbind_module_instance %x : %x with %x : %x",
934+
tr_dbg(&ipc_tr, "%x : %x with %x : %x",
935935
(uint32_t)bu.primary.r.module_id, (uint32_t)bu.primary.r.instance_id,
936936
(uint32_t)bu.extension.r.dst_module_id, (uint32_t)bu.extension.r.dst_instance_id);
937937

@@ -946,7 +946,7 @@ static int ipc4_set_get_config_module_instance(struct ipc4_message_request *ipc4
946946
struct comp_dev *dev = NULL;
947947
int ret;
948948

949-
tr_dbg(&ipc_tr, "ipc4_set_get_config_module_instance %x : %x, set %d",
949+
tr_dbg(&ipc_tr, "%x : %x, set %d",
950950
(uint32_t)config->primary.r.module_id, (uint32_t)config->primary.r.instance_id,
951951
!!set);
952952

@@ -977,7 +977,7 @@ static int ipc4_set_get_config_module_instance(struct ipc4_message_request *ipc4
977977

978978
ret = function(dev, COMP_ATTR_IPC4_CONFIG, &config->extension.dat);
979979
if (ret < 0) {
980-
ipc_cmd_err(&ipc_tr, "ipc4_set_get_config_module_instance %x : %x failed %d, set %u, param %x",
980+
ipc_cmd_err(&ipc_tr, "%x : %x failed %d, set %u, param %x",
981981
(uint32_t)config->primary.r.module_id,
982982
(uint32_t)config->primary.r.instance_id, ret, !!set,
983983
(uint32_t)config->extension.dat);
@@ -1131,7 +1131,7 @@ __cold static int ipc4_get_large_config_module_instance(struct ipc4_message_requ
11311131
if (ret < 0)
11321132
return IPC4_FAILURE;
11331133

1134-
tr_dbg(&ipc_tr, "ipc4_get_large_config_module_instance %x : %x",
1134+
tr_dbg(&ipc_tr, "%x : %x",
11351135
(uint32_t)config.primary.r.module_id, (uint32_t)config.primary.r.instance_id);
11361136

11371137
/* get component dev for non-basefw since there is no
@@ -1293,7 +1293,7 @@ __cold static int ipc4_set_large_config_module_instance(struct ipc4_message_requ
12931293

12941294
dcache_invalidate_region((__sparse_force void __sparse_cache *)MAILBOX_HOSTBOX_BASE,
12951295
config.extension.r.data_off_size);
1296-
tr_dbg(&ipc_tr, "ipc4_set_large_config_module_instance %x : %x",
1296+
tr_dbg(&ipc_tr, "%x : %x",
12971297
(uint32_t)config.primary.r.module_id, (uint32_t)config.primary.r.instance_id);
12981298

12991299
if (config.primary.r.module_id) {
@@ -1362,7 +1362,7 @@ __cold static int ipc4_delete_module_instance(struct ipc4_message_request *ipc4)
13621362
if (ret < 0)
13631363
return IPC4_FAILURE;
13641364

1365-
tr_dbg(&ipc_tr, "ipc4_delete_module_instance %x : %x", (uint32_t)module.primary.r.module_id,
1365+
tr_dbg(&ipc_tr, "%x : %x", (uint32_t)module.primary.r.module_id,
13661366
(uint32_t)module.primary.r.instance_id);
13671367

13681368
comp_id = IPC4_COMP_ID(module.primary.r.module_id, module.primary.r.instance_id);
@@ -1393,7 +1393,7 @@ __cold static int ipc4_module_process_d0ix(struct ipc4_message_request *ipc4)
13931393
module_id = d0ix.primary.r.module_id;
13941394
instance_id = d0ix.primary.r.instance_id;
13951395

1396-
tr_dbg(&ipc_tr, "ipc4_module_process_d0ix %x : %x", module_id, instance_id);
1396+
tr_dbg(&ipc_tr, "%x : %x", module_id, instance_id);
13971397

13981398
/* only module 0 can be used to set d0ix state */
13991399
if (d0ix.primary.r.module_id || d0ix.primary.r.instance_id) {
@@ -1442,7 +1442,7 @@ __cold static int ipc4_module_process_dx(struct ipc4_message_request *ipc4)
14421442

14431443
/* check if core enable mask is valid */
14441444
if (dx_info.core_mask > MASK(CONFIG_CORE_COUNT - 1, 0)) {
1445-
ipc_cmd_err(&ipc_tr, "ipc4_module_process_dx: CONFIG_CORE_COUNT: %d < core enable mask: %d",
1445+
ipc_cmd_err(&ipc_tr, "CONFIG_CORE_COUNT: %d < core enable mask: %d",
14461446
CONFIG_CORE_COUNT, dx_info.core_mask);
14471447
return IPC4_ERROR_INVALID_PARAM;
14481448
}

‎src/ipc/ipc4/helper.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ __cold static int ipc4_add_comp_dev(struct comp_dev *dev)
12631263
icd->core = dev->ipc_config.core;
12641264
icd->id = dev->ipc_config.id;
12651265

1266-
tr_dbg(&ipc_tr, "ipc4_add_comp_dev add comp 0x%x", icd->id);
1266+
tr_dbg(&ipc_tr, "add comp 0x%x", icd->id);
12671267
/* add new component to the list */
12681268
list_item_append(&icd->list, &ipc->comp_list);
12691269

‎src/lib/agent.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ static enum task_state validate(void *data)
8181
/* warning timeout */
8282
if (delta > sa->warn_timeout) {
8383
if (delta > UINT_MAX)
84-
tr_warn(&sa_tr, "validate(), ll drift detected, delta > %u", UINT_MAX);
84+
tr_warn(&sa_tr, "ll drift detected, delta > %u", UINT_MAX);
8585
else
86-
tr_warn(&sa_tr, "validate(), ll drift detected, delta = %u",
86+
tr_warn(&sa_tr, "ll drift detected, delta = %u",
8787
(unsigned int)delta);
8888
}
8989

@@ -98,9 +98,9 @@ void sa_init(struct sof *sof, uint64_t timeout)
9898
uint64_t ticks;
9999

100100
if (timeout > UINT_MAX)
101-
tr_warn(&sa_tr, "sa_init(), timeout > %u", UINT_MAX);
101+
tr_warn(&sa_tr, "timeout > %u", UINT_MAX);
102102
else
103-
tr_info(&sa_tr, "sa_init(), timeout = %u", (unsigned int)timeout);
103+
tr_info(&sa_tr, "timeout = %u", (unsigned int)timeout);
104104

105105
sof->sa = rzalloc(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT, sizeof(*sof->sa));
106106

@@ -117,10 +117,10 @@ void sa_init(struct sof *sof, uint64_t timeout)
117117
if (ticks > UINT_MAX || sof->sa->warn_timeout > UINT_MAX ||
118118
sof->sa->panic_timeout > UINT_MAX)
119119
tr_info(&sa_tr,
120-
"sa_init(), some of the values are > %u", UINT_MAX);
120+
"some of the values are > %u", UINT_MAX);
121121
else
122122
tr_info(&sa_tr,
123-
"sa_init(), ticks = %u, sof->sa->warn_timeout = %u, sof->sa->panic_timeout = %u",
123+
"ticks = %u, sof->sa->warn_timeout = %u, sof->sa->panic_timeout = %u",
124124
(unsigned int)ticks, (unsigned int)sof->sa->warn_timeout,
125125
(unsigned int)sof->sa->panic_timeout);
126126

‎src/lib/ams.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ static int ams_process_slot(struct async_message_service *ams, uint32_t slot)
495495
instance_id = shared_c->slots[slot].instance_id;
496496

497497
ams_release(shared_c);
498-
tr_info(&ams_tr, "ams_process_slot slot %d msg %d from 0x%08x",
498+
tr_info(&ams_tr, "slot %d msg %d from 0x%08x",
499499
slot, msg.message_type_id,
500500
msg.producer_module_id << 16 | msg.producer_instance_id);
501501

‎src/lib/dai.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ void dai_put(struct dai *dai)
325325

326326
ret = dai_remove(dai->dev);
327327
if (ret < 0) {
328-
tr_err(&dai_tr, "dai_put_zephyr: index %d failed ret = %d",
328+
tr_err(&dai_tr, "index %d failed ret = %d",
329329
dai->index, ret);
330330
}
331331

@@ -391,11 +391,11 @@ void dai_put(struct dai *dai)
391391
if (--dai->sref == 0) {
392392
ret = dai_remove(dai);
393393
if (ret < 0) {
394-
tr_err(&dai_tr, "dai_put: type %d index %d dai_remove() failed ret = %d",
394+
tr_err(&dai_tr, "type %d index %d dai_remove() failed ret = %d",
395395
dai->drv->type, dai->index, ret);
396396
}
397397
}
398-
tr_info(&dai_tr, "dai_put type %d index %d new sref %d",
398+
tr_info(&dai_tr, "type %d index %d new sref %d",
399399
dai->drv->type, dai->index, dai->sref);
400400
k_spin_unlock(&dai->lock, key);
401401
}

‎src/lib/dma.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,11 +278,11 @@ void dma_put(struct dma *dma)
278278
if (--dma->sref == 0) {
279279
ret = dma_remove_legacy(dma);
280280
if (ret < 0) {
281-
tr_err(&dma_tr, "dma_put(): dma_remove() failed id = %d, ret = %d",
281+
tr_err(&dma_tr, "dma_remove() failed id = %d, ret = %d",
282282
dma->plat_data.id, ret);
283283
}
284284
}
285-
tr_info(&dma_tr, "dma_put(), dma = %p, sref = %d",
285+
tr_info(&dma_tr, "dma = %p, sref = %d",
286286
dma, dma->sref);
287287
k_spin_unlock(&dma->lock, key);
288288
}

0 commit comments

Comments
 (0)