Skip to content

Commit 4ec4c77

Browse files
lyakhlgirdwood
authored andcommitted
audio: remove function names from logging calls (7/8)
Remove verbatim function names for pipeline, drc, igo_nr, volume, multiband_drc, buffers, tdfb. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent c7c7a46 commit 4ec4c77

14 files changed

Lines changed: 63 additions & 63 deletions

File tree

src/audio/buffers/comp_buffer.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ static struct comp_buffer *buffer_alloc_struct(void *stream_addr, size_t size,
201201
buffer = rzalloc(flags, sizeof(*buffer));
202202

203203
if (!buffer) {
204-
tr_err(&buffer_tr, "buffer_alloc_struct(): could not alloc structure");
204+
tr_err(&buffer_tr, "could not alloc structure");
205205
return NULL;
206206
}
207207

@@ -236,20 +236,20 @@ struct comp_buffer *buffer_alloc(size_t size, uint32_t flags, uint32_t align,
236236

237237
/* validate request */
238238
if (size == 0) {
239-
tr_err(&buffer_tr, "buffer_alloc(): new size = %zu is invalid", size);
239+
tr_err(&buffer_tr, "new size = %zu is invalid", size);
240240
return NULL;
241241
}
242242

243243
stream_addr = rballoc_align(flags, size, align);
244244
if (!stream_addr) {
245-
tr_err(&buffer_tr, "buffer_alloc(): could not alloc size = %zu bytes of flags = 0x%x",
245+
tr_err(&buffer_tr, "could not alloc size = %zu bytes of flags = 0x%x",
246246
size, flags);
247247
return NULL;
248248
}
249249

250250
buffer = buffer_alloc_struct(stream_addr, size, flags, is_shared);
251251
if (!buffer) {
252-
tr_err(&buffer_tr, "buffer_alloc(): could not alloc buffer structure");
252+
tr_err(&buffer_tr, "could not alloc buffer structure");
253253
rfree(stream_addr);
254254
}
255255

@@ -263,11 +263,11 @@ struct comp_buffer *buffer_alloc_range(size_t preferred_size, size_t minimum_siz
263263
size_t size;
264264
void *stream_addr = NULL;
265265

266-
tr_dbg(&buffer_tr, "buffer_alloc_range(): %zu -- %zu bytes", minimum_size, preferred_size);
266+
tr_dbg(&buffer_tr, "%zu -- %zu bytes", minimum_size, preferred_size);
267267

268268
/* validate request */
269269
if (minimum_size == 0 || preferred_size < minimum_size) {
270-
tr_err(&buffer_tr, "buffer_alloc_range(): new size range %zu -- %zu is invalid",
270+
tr_err(&buffer_tr, "new size range %zu -- %zu is invalid",
271271
minimum_size, preferred_size);
272272
return NULL;
273273
}
@@ -282,17 +282,17 @@ struct comp_buffer *buffer_alloc_range(size_t preferred_size, size_t minimum_siz
282282
break;
283283
}
284284

285-
tr_dbg(&buffer_tr, "buffer_alloc_range(): allocated %zu bytes", size);
285+
tr_dbg(&buffer_tr, "allocated %zu bytes", size);
286286

287287
if (!stream_addr) {
288-
tr_err(&buffer_tr, "buffer_alloc_range(): could not alloc size = %zu bytes of type = 0x%x",
288+
tr_err(&buffer_tr, "could not alloc size = %zu bytes of type = 0x%x",
289289
minimum_size, flags);
290290
return NULL;
291291
}
292292

293293
buffer = buffer_alloc_struct(stream_addr, size, flags, is_shared);
294294
if (!buffer) {
295-
tr_err(&buffer_tr, "buffer_alloc_range(): could not alloc buffer structure");
295+
tr_err(&buffer_tr, "could not alloc buffer structure");
296296
rfree(stream_addr);
297297
}
298298

src/audio/drc/drc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,15 @@ __cold static int drc_init(struct processing_module *mod)
173173
/* Handler for configuration data */
174174
cd->model_handler = comp_data_blob_handler_new(dev);
175175
if (!cd->model_handler) {
176-
comp_err(dev, "drc_init(): comp_data_blob_handler_new() failed.");
176+
comp_err(dev, "comp_data_blob_handler_new() failed.");
177177
ret = -ENOMEM;
178178
goto cd_fail;
179179
}
180180

181181
/* Get configuration data and reset DRC state */
182182
ret = comp_init_data_blob(cd->model_handler, bs, cfg->data);
183183
if (ret < 0) {
184-
comp_err(dev, "drc_init(): comp_init_data_blob() failed.");
184+
comp_err(dev, "comp_init_data_blob() failed.");
185185
goto cd_fail;
186186
}
187187

src/audio/igo_nr/igo_nr.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -428,14 +428,14 @@ static int igo_nr_init(struct processing_module *mod)
428428
md->private = cd;
429429
ret = IgoLibGetInfo(&cd->igo_lib_info);
430430
if (ret != IGO_RET_OK) {
431-
comp_err(dev, "igo_nr_init(): IgoLibGetInfo() Failed.");
431+
comp_err(dev, "IgoLibGetInfo() Failed.");
432432
ret = -EINVAL;
433433
goto cd_fail;
434434
}
435435

436436
cd->p_handle = rballoc(SOF_MEM_FLAG_USER, cd->igo_lib_info.handle_size);
437437
if (!cd->p_handle) {
438-
comp_err(dev, "igo_nr_init(): igo_handle memory rballoc error for size %d",
438+
comp_err(dev, "igo_handle memory rballoc error for size %d",
439439
cd->igo_lib_info.handle_size);
440440
ret = -ENOMEM;
441441
goto cd_fail;
@@ -444,15 +444,15 @@ static int igo_nr_init(struct processing_module *mod)
444444
/* Handler for configuration data */
445445
cd->model_handler = comp_data_blob_handler_new(dev);
446446
if (!cd->model_handler) {
447-
comp_err(dev, "igo_nr_init(): comp_data_blob_handler_new() failed.");
447+
comp_err(dev, "comp_data_blob_handler_new() failed.");
448448
ret = -ENOMEM;
449449
goto cd_fail2;
450450
}
451451

452452
/* Get configuration data */
453453
ret = comp_init_data_blob(cd->model_handler, bs, cfg->data);
454454
if (ret < 0) {
455-
comp_err(dev, "igo_nr_init(): comp_init_data_blob() failed.");
455+
comp_err(dev, "comp_init_data_blob() failed.");
456456
ret = -ENOMEM;
457457
goto cd_fail3;
458458
}

src/audio/multiband_drc/multiband_drc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,15 +260,15 @@ static int multiband_drc_init(struct processing_module *mod)
260260
/* Handler for configuration data */
261261
cd->model_handler = comp_data_blob_handler_new(dev);
262262
if (!cd->model_handler) {
263-
comp_err(dev, "multiband_drc_init(): comp_data_blob_handler_new() failed.");
263+
comp_err(dev, "comp_data_blob_handler_new() failed.");
264264
ret = -ENOMEM;
265265
goto cd_fail;
266266
}
267267

268268
/* Get configuration data and reset DRC state */
269269
ret = comp_init_data_blob(cd->model_handler, bs, cfg->data);
270270
if (ret < 0) {
271-
comp_err(dev, "multiband_drc_init(): comp_init_data_blob() failed.");
271+
comp_err(dev, "comp_init_data_blob() failed.");
272272
goto cd_fail;
273273
}
274274
multiband_drc_reset_state(&cd->state);

src/audio/pipeline/pipeline-graph.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ struct pipeline *pipeline_new(uint32_t pipeline_id, uint32_t priority, uint32_t
122122
/* allocate new pipeline */
123123
p = rzalloc(SOF_MEM_FLAG_USER, sizeof(*p));
124124
if (!p) {
125-
pipe_cl_err("pipeline_new(): Out of Memory");
125+
pipe_cl_err("Out of Memory");
126126
return NULL;
127127
}
128128

@@ -135,13 +135,13 @@ struct pipeline *pipeline_new(uint32_t pipeline_id, uint32_t priority, uint32_t
135135
ret = memcpy_s(&p->tctx, sizeof(struct tr_ctx), &pipe_tr,
136136
sizeof(struct tr_ctx));
137137
if (ret < 0) {
138-
pipe_err(p, "pipeline_new(): failed to copy trace settings");
138+
pipe_err(p, "failed to copy trace settings");
139139
goto free;
140140
}
141141

142142
ret = pipeline_posn_offset_get(&p->posn_offset);
143143
if (ret < 0) {
144-
pipe_err(p, "pipeline_new(): pipeline_posn_offset_get failed %d",
144+
pipe_err(p, "pipeline_posn_offset_get failed %d",
145145
ret);
146146
goto free;
147147
}
@@ -152,7 +152,7 @@ struct pipeline *pipeline_new(uint32_t pipeline_id, uint32_t priority, uint32_t
152152
if (posn.rhdr.hdr.size) {
153153
p->msg = ipc_msg_init(posn.rhdr.hdr.cmd, posn.rhdr.hdr.size);
154154
if (!p->msg) {
155-
pipe_err(p, "pipeline_new(): ipc_msg_init failed");
155+
pipe_err(p, "ipc_msg_init failed");
156156
goto free;
157157
}
158158
}
@@ -293,7 +293,7 @@ int pipeline_complete(struct pipeline *p, struct comp_dev *source,
293293

294294
/* check whether pipeline is already completed */
295295
if (p->status != COMP_STATE_INIT) {
296-
pipe_err(p, "pipeline_complete(): Pipeline already completed");
296+
pipe_err(p, "Pipeline already completed");
297297
return -EINVAL;
298298
}
299299

@@ -329,7 +329,7 @@ static int pipeline_comp_reset(struct comp_dev *current,
329329
dev_comp_id(current), dir);
330330

331331
if (!p->source_comp) {
332-
pipe_err(p, "pipeline_comp_reset(): source_comp is NULL");
332+
pipe_err(p, "source_comp is NULL");
333333
return -EINVAL;
334334
}
335335

@@ -354,10 +354,10 @@ static int pipeline_comp_reset(struct comp_dev *current,
354354
* 2. trigger functon skipped due to error of other component's trigger function
355355
*/
356356
if (current->state == COMP_STATE_ACTIVE) {
357-
pipe_warn(current->pipeline, "pipeline_comp_reset(): component is in active state, try to stop it");
357+
pipe_warn(current->pipeline, "component is in active state, try to stop it");
358358
err = comp_trigger(current, COMP_TRIGGER_STOP);
359359
if (err)
360-
pipe_err(current->pipeline, "pipeline_comp_reset(): failed to recover");
360+
pipe_err(current->pipeline, "failed to recover");
361361
}
362362

363363
err = comp_reset(current);
@@ -387,7 +387,7 @@ int pipeline_reset(struct pipeline *p, struct comp_dev *host)
387387

388388
ret = walk_ctx.comp_func(host, NULL, &walk_ctx, host->direction);
389389
if (ret < 0) {
390-
pipe_err(p, "pipeline_reset(): ret = %d, host->comp.id = 0x%x",
390+
pipe_err(p, "ret = %d, host->comp.id = 0x%x",
391391
ret, dev_comp_id(host));
392392
} else {
393393
/* pipeline is reset to default state */

src/audio/pipeline/pipeline-params.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static int pipeline_comp_params_neg(struct comp_dev *current,
6060
* drop an error and reject the .params() command.
6161
*/
6262
pipe_err(current->pipeline,
63-
"pipeline_comp_params_neg(): params conflict with existing active pipeline!");
63+
"params conflict with existing active pipeline!");
6464
err = -EINVAL;
6565
}
6666
}
@@ -144,7 +144,7 @@ static int pipeline_comp_hw_params(struct comp_dev *current,
144144
&ppl_data->params->params, dir);
145145
if (ret < 0) {
146146
pipe_err(current->pipeline,
147-
"pipeline_comp_hw_params(): failed getting DAI parameters: %d",
147+
"failed getting DAI parameters: %d",
148148
ret);
149149
return ret;
150150
}
@@ -170,7 +170,7 @@ static int pipeline_comp_hw_params_buf(struct comp_dev *current,
170170
BUFFER_UPDATE_IF_UNSET);
171171
if (ret < 0)
172172
pipe_err(current->pipeline,
173-
"pipeline_comp_hw_params(): buffer_set_params(): %d", ret);
173+
"buffer_set_params(): %d", ret);
174174
}
175175

176176
return ret;
@@ -226,14 +226,14 @@ int pipeline_params(struct pipeline *p, struct comp_dev *host,
226226

227227
ret = hw_param_ctx.comp_func(host, NULL, &hw_param_ctx, dir);
228228
if (ret < 0) {
229-
pipe_err(p, "pipeline_params(): ret = %d, dev->comp.id = 0x%x",
229+
pipe_err(p, "ret = %d, dev->comp.id = 0x%x",
230230
ret, dev_comp_id(host));
231231
return ret;
232232
}
233233

234234
ret = buf_param_ctx.comp_func(host, NULL, &buf_param_ctx, dir);
235235
if (ret < 0) {
236-
pipe_err(p, "pipeline_params(): ret = %d, dev->comp.id = 0x%x",
236+
pipe_err(p, "ret = %d, dev->comp.id = 0x%x",
237237
ret, dev_comp_id(host));
238238
return ret;
239239
}
@@ -244,7 +244,7 @@ int pipeline_params(struct pipeline *p, struct comp_dev *host,
244244

245245
ret = param_ctx.comp_func(host, NULL, &param_ctx, dir);
246246
if (ret < 0) {
247-
pipe_err(p, "pipeline_params(): ret = %d, host->comp.id = 0x%x",
247+
pipe_err(p, "ret = %d, host->comp.id = 0x%x",
248248
ret, dev_comp_id(host));
249249
}
250250

@@ -312,7 +312,7 @@ int pipeline_prepare(struct pipeline *p, struct comp_dev *dev)
312312

313313
ret = walk_ctx.comp_func(dev, NULL, &walk_ctx, dev->direction);
314314
if (ret < 0) {
315-
pipe_err(p, "pipeline_prepare(): ret = %d, dev->comp.id = 0x%x",
315+
pipe_err(p, "ret = %d, dev->comp.id = 0x%x",
316316
ret, dev_comp_id(dev));
317317
return ret;
318318
}

src/audio/pipeline/pipeline-schedule.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static enum task_state pipeline_task_cmd(struct pipeline *p,
100100

101101
err = pipeline_trigger_run(p, host, cmd);
102102
if (err < 0) {
103-
pipe_err(p, "pipeline_task_cmd(): failed to trigger components: %d", err);
103+
pipe_err(p, "failed to trigger components: %d", err);
104104
reply->error = err;
105105
err = SOF_TASK_STATE_COMPLETED;
106106
} else {
@@ -225,7 +225,7 @@ static enum task_state pipeline_task(void *arg)
225225
/* try to recover */
226226
err = pipeline_xrun_recover(p);
227227
if (err < 0) {
228-
pipe_err(p, "pipeline_task(): xrun recovery failed! pipeline is stopped.");
228+
pipe_err(p, "xrun recovery failed! pipeline is stopped.");
229229
/* failed - host will stop this pipeline */
230230
return SOF_TASK_STATE_COMPLETED;
231231
}
@@ -359,7 +359,7 @@ int pipeline_comp_ll_task_init(struct pipeline *p)
359359

360360
p->pipe_task = pipeline_task_init(p, type);
361361
if (!p->pipe_task) {
362-
pipe_err(p, "pipeline_comp_task_init(): task init failed");
362+
pipe_err(p, "task init failed");
363363
return -ENOMEM;
364364
}
365365
}

src/audio/pipeline/pipeline-stream.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ int pipeline_copy(struct pipeline *p)
183183

184184
ret = walk_ctx.comp_func(start, NULL, &walk_ctx, dir);
185185
if (ret < 0)
186-
pipe_err(p, "pipeline_copy(): ret = %d, start->comp.id = %u, dir = %u",
186+
pipe_err(p, "ret = %d, start->comp.id = %u, dir = %u",
187187
ret, dev_comp_id(start), dir);
188188

189189
return ret;
@@ -267,7 +267,7 @@ static int pipeline_trigger_list(struct pipeline *p, struct comp_dev *host, int
267267

268268
ret = walk_ctx.comp_func(host, NULL, &walk_ctx, host->direction);
269269
if (ret < 0) {
270-
pipe_err(p, "pipeline_trigger_list(): ret = %d, host->comp.id = %u, cmd = %d",
270+
pipe_err(p, "ret = %d, host->comp.id = %u, cmd = %d",
271271
ret, dev_comp_id(host), cmd);
272272
} else {
273273
if (cmd == COMP_TRIGGER_PRE_START) {
@@ -595,7 +595,7 @@ int pipeline_trigger_run(struct pipeline *p, struct comp_dev *host, int cmd)
595595

596596
ret = walk_ctx.comp_func(host, NULL, &walk_ctx, host->direction);
597597
if (ret < 0) {
598-
pipe_err(p, "pipeline_trigger_run(): ret = %d, host->comp.id = %u, cmd = %d",
598+
pipe_err(p, "ret = %d, host->comp.id = %u, cmd = %d",
599599
ret, dev_comp_id(host), cmd);
600600
goto out;
601601
}
@@ -624,7 +624,7 @@ int pipeline_trigger_run(struct pipeline *p, struct comp_dev *host, int cmd)
624624

625625
ret = walk_ctx.comp_func(host, NULL, &walk_ctx, host->direction);
626626
if (ret < 0)
627-
pipe_err(p, "pipeline_trigger_run(): ret = %d, host->comp.id = %u, cmd = %d",
627+
pipe_err(p, "ret = %d, host->comp.id = %u, cmd = %d",
628628
ret, dev_comp_id(host), cmd);
629629
else if (ret == PPL_STATUS_PATH_STOP)
630630
ret = 0;
@@ -658,7 +658,7 @@ void pipeline_get_timestamp(struct pipeline *p, struct comp_dev *host,
658658
dai = pipeline_get_dai_comp(host->pipeline->pipeline_id, PPL_DIR_UPSTREAM);
659659

660660
if (!dai) {
661-
pipe_dbg(p, "pipeline_get_timestamp(): DAI position update failed");
661+
pipe_dbg(p, "DAI position update failed");
662662
return;
663663
}
664664

src/audio/pipeline/pipeline-xrun.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ int pipeline_xrun_recover(struct pipeline *p)
6868
/* prepare the pipeline */
6969
ret = pipeline_prepare(p, p->source_comp);
7070
if (ret < 0) {
71-
pipe_err(p, "pipeline_xrun_recover(): pipeline_prepare() failed, ret = %d",
71+
pipe_err(p, "pipeline_prepare() failed, ret = %d",
7272
ret);
7373
return ret;
7474
}
@@ -79,7 +79,7 @@ int pipeline_xrun_recover(struct pipeline *p)
7979
/* restart pipeline comps */
8080
ret = pipeline_trigger(p, p->source_comp, COMP_TRIGGER_START);
8181
if (ret < 0) {
82-
pipe_err(p, "pipeline_xrun_recover(): pipeline_trigger() failed, ret = %d",
82+
pipe_err(p, "pipeline_trigger() failed, ret = %d",
8383
ret);
8484
return ret;
8585
}
@@ -159,7 +159,7 @@ void pipeline_xrun(struct pipeline *p, struct comp_dev *dev,
159159
/* notify all pipeline comps we are in XRUN, and stop copying */
160160
ret = pipeline_trigger(p, p->source_comp, COMP_TRIGGER_XRUN);
161161
if (ret < 0)
162-
pipe_err(p, "pipeline_xrun(): Pipelines notification about XRUN failed, ret = %d",
162+
pipe_err(p, "Pipelines notification about XRUN failed, ret = %d",
163163
ret);
164164

165165
memset(&posn, 0, sizeof(posn));

src/audio/tdfb/tdfb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,15 +576,15 @@ static int tdfb_init(struct processing_module *mod)
576576
/* Handler for configuration data */
577577
cd->model_handler = comp_data_blob_handler_new(dev);
578578
if (!cd->model_handler) {
579-
comp_err(dev, "tdfb_init(): comp_data_blob_handler_new() failed.");
579+
comp_err(dev, "comp_data_blob_handler_new() failed.");
580580
ret = -ENOMEM;
581581
goto err;
582582
}
583583

584584
/* Get configuration data and reset FIR filters */
585585
ret = comp_init_data_blob(cd->model_handler, bs, cfg->data);
586586
if (ret < 0) {
587-
comp_err(dev, "tdfb_init(): comp_init_data_blob() failed.");
587+
comp_err(dev, "comp_init_data_blob() failed.");
588588
goto err;
589589
}
590590

0 commit comments

Comments
 (0)