Skip to content

Commit b65865f

Browse files
lyakhlgirdwood
authored andcommitted
audio: module-adapter: remove more function names from logs
Remove left-over function names in log prints in generic.c, also remove component ID prints in comp_*() calls because they print the ID automatically. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent 027a611 commit b65865f

1 file changed

Lines changed: 24 additions & 37 deletions

File tree

src/audio/module_adapter/module/generic.c

Lines changed: 24 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ int module_load_config(struct comp_dev *dev, const void *cfg, size_t size)
3535
struct processing_module *mod = comp_mod(dev);
3636
struct module_data *md = &mod->priv;
3737

38-
comp_dbg(dev, "module_load_config() start");
38+
comp_dbg(dev, "entry");
3939

4040
if (!cfg || !size) {
4141
comp_err(dev, "wrong input params! dev %zx, cfg %zx size %zu",
@@ -67,7 +67,7 @@ int module_load_config(struct comp_dev *dev, const void *cfg, size_t size)
6767
dst->size = size;
6868
dst->avail = true;
6969

70-
comp_dbg(dev, "module_load_config() done");
70+
comp_dbg(dev, "done");
7171
return ret;
7272
}
7373

@@ -78,7 +78,7 @@ int module_init(struct processing_module *mod)
7878
struct comp_dev *dev = mod->dev;
7979
const struct module_interface *const interface = dev->drv->adapter_ops;
8080

81-
comp_dbg(dev, "module_init() start");
81+
comp_dbg(dev, "entry");
8282

8383
#if CONFIG_IPC_MAJOR_3
8484
if (mod->priv.state == MODULE_INITIALIZED)
@@ -87,17 +87,15 @@ int module_init(struct processing_module *mod)
8787
return -EPERM;
8888
#endif
8989
if (!interface) {
90-
comp_err(dev, "module interface not defined for comp id %#x",
91-
dev_comp_id(dev));
90+
comp_err(dev, "module interface not defined");
9291
return -EIO;
9392
}
9493

9594
/* check interface, there must be one and only one of processing procedure */
9695
if (!interface->init ||
9796
(!!interface->process + !!interface->process_audio_stream +
9897
!!interface->process_raw_data < 1)) {
99-
comp_err(dev, "comp %#x is missing mandatory interfaces",
100-
dev_comp_id(dev));
98+
comp_err(dev, "comp is missing mandatory interfaces");
10199
return -EIO;
102100
}
103101

@@ -113,12 +111,11 @@ int module_init(struct processing_module *mod)
113111
/* Now we can proceed with module specific initialization */
114112
ret = interface->init(mod);
115113
if (ret) {
116-
comp_err(dev, "module_init() error %d: module specific init failed, comp id %#x",
117-
ret, dev_comp_id(dev));
114+
comp_err(dev, "error %d: module specific init failed", ret);
118115
return ret;
119116
}
120117

121-
comp_dbg(dev, "module_init() done");
118+
comp_dbg(dev, "done");
122119
#if CONFIG_IPC_MAJOR_3
123120
md->state = MODULE_INITIALIZED;
124121
#endif
@@ -182,7 +179,7 @@ void *mod_alloc_align(struct processing_module *mod, uint32_t size, uint32_t ali
182179
return NULL;
183180

184181
if (!size) {
185-
comp_err(mod->dev, "mod_alloc: requested allocation of 0 bytes.");
182+
comp_err(mod->dev, "requested allocation of 0 bytes.");
186183
container_put(mod, container);
187184
return NULL;
188185
}
@@ -194,8 +191,7 @@ void *mod_alloc_align(struct processing_module *mod, uint32_t size, uint32_t ali
194191
ptr = rballoc(SOF_MEM_FLAG_USER, size);
195192

196193
if (!ptr) {
197-
comp_err(mod->dev, "mod_alloc: failed to allocate memory for comp %x.",
198-
dev_comp_id(mod->dev));
194+
comp_err(mod->dev, "failed to allocate memory.");
199195
container_put(mod, container);
200196
return NULL;
201197
}
@@ -368,8 +364,7 @@ int mod_free(struct processing_module *mod, const void *ptr)
368364
}
369365
}
370366

371-
comp_err(mod->dev, "mod_free: error: could not find memory pointed by %p",
372-
ptr);
367+
comp_err(mod->dev, "error: could not find memory pointed by %p", ptr);
373368

374369
return -EINVAL;
375370
}
@@ -399,7 +394,7 @@ int module_prepare(struct processing_module *mod,
399394
struct comp_dev *dev = mod->dev;
400395
const struct module_interface *const ops = dev->drv->adapter_ops;
401396

402-
comp_dbg(dev, "module_prepare() start");
397+
comp_dbg(dev, "entry");
403398

404399
#if CONFIG_IPC_MAJOR_3
405400
if (mod->priv.state == MODULE_IDLE)
@@ -411,8 +406,7 @@ int module_prepare(struct processing_module *mod,
411406
int ret = ops->prepare(mod, sources, num_of_sources, sinks, num_of_sinks);
412407

413408
if (ret) {
414-
comp_err(dev, "module_prepare() error %d: module specific prepare failed, comp_id %d",
415-
ret, dev_comp_id(dev));
409+
comp_err(dev, "error %d: module specific prepare failed", ret);
416410
return ret;
417411
}
418412
}
@@ -429,7 +423,7 @@ int module_prepare(struct processing_module *mod,
429423
#if CONFIG_IPC_MAJOR_3
430424
md->state = MODULE_IDLE;
431425
#endif
432-
comp_dbg(dev, "module_prepare() done");
426+
comp_dbg(dev, "done");
433427

434428
return 0;
435429
}
@@ -443,14 +437,13 @@ int module_process_legacy(struct processing_module *mod,
443437
const struct module_interface *const ops = dev->drv->adapter_ops;
444438
int ret;
445439

446-
comp_dbg(dev, "module_process_legacy() start");
440+
comp_dbg(dev, "entry");
447441

448442
#if CONFIG_IPC_MAJOR_3
449443
struct module_data *md = &mod->priv;
450444

451445
if (md->state != MODULE_IDLE) {
452-
comp_err(dev, "wrong state of comp_id %x, state %d",
453-
dev_comp_id(dev), md->state);
446+
comp_err(dev, "wrong state %d", md->state);
454447
return -EPERM;
455448
}
456449

@@ -467,12 +460,11 @@ int module_process_legacy(struct processing_module *mod,
467460
ret = -EOPNOTSUPP;
468461

469462
if (ret && ret != -ENOSPC && ret != -ENODATA) {
470-
comp_err(dev, "module_process() error %d: for comp %#x",
471-
ret, dev_comp_id(dev));
463+
comp_err(dev, "error %d", ret);
472464
return ret;
473465
}
474466

475-
comp_dbg(dev, "module_process_legacy() done");
467+
comp_dbg(dev, "done");
476468

477469
#if CONFIG_IPC_MAJOR_3
478470
/* reset state to idle */
@@ -490,13 +482,12 @@ int module_process_sink_src(struct processing_module *mod,
490482
const struct module_interface *const ops = dev->drv->adapter_ops;
491483
int ret;
492484

493-
comp_dbg(dev, "module_process sink src() start");
485+
comp_dbg(dev, "entry");
494486

495487
#if CONFIG_IPC_MAJOR_3
496488
struct module_data *md = &mod->priv;
497489
if (md->state != MODULE_IDLE) {
498-
comp_err(dev, "wrong state of comp_id %x, state %d",
499-
dev_comp_id(dev), md->state);
490+
comp_err(dev, "wrong state %d", md->state);
500491
return -EPERM;
501492
}
502493

@@ -507,12 +498,11 @@ int module_process_sink_src(struct processing_module *mod,
507498
ret = ops->process(mod, sources, num_of_sources, sinks, num_of_sinks);
508499

509500
if (ret && ret != -ENOSPC && ret != -ENODATA) {
510-
comp_err(dev, "module_process() error %d: for comp %#x",
511-
ret, dev_comp_id(dev));
501+
comp_err(dev, "error %d", ret);
512502
return ret;
513503
}
514504

515-
comp_dbg(dev, "module_process sink src() done");
505+
comp_dbg(dev, "done");
516506

517507
#if CONFIG_IPC_MAJOR_3
518508
/* reset state to idle */
@@ -540,8 +530,7 @@ int module_reset(struct processing_module *mod)
540530
if (ret) {
541531
if (ret != PPL_STATUS_PATH_STOP)
542532
comp_err(mod->dev,
543-
"module_reset() error %d: module specific reset() failed for comp %#xd",
544-
ret, dev_comp_id(mod->dev));
533+
"error %d: module specific reset() failed", ret);
545534
return ret;
546535
}
547536
}
@@ -602,8 +591,7 @@ int module_free(struct processing_module *mod)
602591
if (ops->free) {
603592
ret = ops->free(mod);
604593
if (ret)
605-
comp_warn(mod->dev, "error: %d for %d",
606-
ret, dev_comp_id(mod->dev));
594+
comp_warn(mod->dev, "error: %d", ret);
607595
}
608596

609597
/* Free all memory shared by module_adapter & module */
@@ -702,8 +690,7 @@ int module_set_configuration(struct processing_module *mod,
702690

703691
ret = memcpy_s(dst, md->new_cfg_size - offset, fragment, fragment_size);
704692
if (ret < 0) {
705-
comp_err(dev, "error: %d failed to copy fragment",
706-
ret);
693+
comp_err(dev, "error: %d failed to copy fragment", ret);
707694
return ret;
708695
}
709696

0 commit comments

Comments
 (0)