Skip to content

Commit a428955

Browse files
lyakhlgirdwood
authored andcommitted
audio: chain_dma: (cosmetic) remove function names from logs
Zephyr inserts function names into logs automatically, no need to duplicate them in log format strings. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent fa841ef commit a428955

1 file changed

Lines changed: 23 additions & 25 deletions

File tree

src/audio/chain_dma.c

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static int chain_link_start(struct comp_dev *dev)
9898
if (err < 0)
9999
return err;
100100

101-
comp_info(dev, "chain_link_start(): dma_start() link chan_index = %u",
101+
comp_info(dev, "dma_start() link chan_index = %u",
102102
cd->chan_link->index);
103103
return 0;
104104
}
@@ -112,7 +112,7 @@ static int chain_link_stop(struct comp_dev *dev)
112112
if (err < 0)
113113
return err;
114114

115-
comp_info(dev, "chain_link_stop(): dma_stop() link chan_index = %u",
115+
comp_info(dev, "dma_stop() link chan_index = %u",
116116
cd->chan_link->index);
117117

118118
return 0;
@@ -127,7 +127,7 @@ static int chain_host_stop(struct comp_dev *dev)
127127
if (err < 0)
128128
return err;
129129

130-
comp_info(dev, "chain_host_stop(): dma_stop() host chan_index = %u",
130+
comp_info(dev, "dma_stop() host chan_index = %u",
131131
cd->chan_host->index);
132132

133133
return 0;
@@ -187,11 +187,11 @@ static enum task_state chain_task_run(void *data)
187187
case 0:
188188
break;
189189
case -EPIPE:
190-
tr_warn(&chain_dma_tr, "chain_task_run(): dma_get_status() link xrun occurred,"
190+
tr_warn(&chain_dma_tr, "dma_get_status() link xrun occurred,"
191191
" ret = %d", ret);
192192
break;
193193
default:
194-
tr_err(&chain_dma_tr, "chain_task_run(): dma_get_status() error, ret = %d", ret);
194+
tr_err(&chain_dma_tr, "dma_get_status() error, ret = %d", ret);
195195
return SOF_TASK_STATE_COMPLETED;
196196
}
197197

@@ -202,7 +202,7 @@ static enum task_state chain_task_run(void *data)
202202
/* Host DMA does not report xruns. All error values will be treated as critical. */
203203
ret = chain_get_dma_status(cd, cd->chan_host, &stat);
204204
if (ret < 0) {
205-
tr_err(&chain_dma_tr, "chain_task_run(): dma_get_status() error, ret = %d", ret);
205+
tr_err(&chain_dma_tr, "dma_get_status() error, ret = %d", ret);
206206
return SOF_TASK_STATE_COMPLETED;
207207
}
208208

@@ -221,14 +221,14 @@ static enum task_state chain_task_run(void *data)
221221
ret = dma_reload(cd->chan_host->dma->z_dev, cd->chan_host->index, 0, 0, increment);
222222
if (ret < 0) {
223223
tr_err(&chain_dma_tr,
224-
"chain_task_run(): dma_reload() host error, ret = %d", ret);
224+
"dma_reload() host error, ret = %d", ret);
225225
return SOF_TASK_STATE_COMPLETED;
226226
}
227227

228228
ret = dma_reload(cd->chan_link->dma->z_dev, cd->chan_link->index, 0, 0, increment);
229229
if (ret < 0) {
230230
tr_err(&chain_dma_tr,
231-
"chain_task_run(): dma_reload() link error, ret = %d", ret);
231+
"dma_reload() link error, ret = %d", ret);
232232
return SOF_TASK_STATE_COMPLETED;
233233
}
234234
} else {
@@ -246,8 +246,7 @@ static enum task_state chain_task_run(void *data)
246246
half_buff_size);
247247
if (ret < 0) {
248248
tr_err(&chain_dma_tr,
249-
"chain_task_run(): dma_reload() link error, ret = %d",
250-
ret);
249+
"dma_reload() link error, ret = %d", ret);
251250
return SOF_TASK_STATE_COMPLETED;
252251
}
253252
cd->first_data_received = true;
@@ -262,7 +261,7 @@ static enum task_state chain_task_run(void *data)
262261
0, 0, transferred);
263262
if (ret < 0) {
264263
tr_err(&chain_dma_tr,
265-
"chain_task_run(): dma_reload() host error, ret = %d", ret);
264+
"dma_reload() host error, ret = %d", ret);
266265
return SOF_TASK_STATE_COMPLETED;
267266
}
268267

@@ -271,8 +270,8 @@ static enum task_state chain_task_run(void *data)
271270
ret = dma_reload(cd->chan_link->dma->z_dev, cd->chan_link->index,
272271
0, 0, half_buff_size);
273272
if (ret < 0) {
274-
tr_err(&chain_dma_tr, "chain_task_run(): dma_reload() "
275-
"link error, ret = %d", ret);
273+
tr_err(&chain_dma_tr,
274+
"dma_reload() link error, ret = %d", ret);
276275
return SOF_TASK_STATE_COMPLETED;
277276
}
278277
}
@@ -288,7 +287,7 @@ static int chain_task_start(struct comp_dev *dev)
288287
k_spinlock_key_t key;
289288
int ret;
290289

291-
comp_info(dev, "chain_task_start(), host_dma_id = 0x%08x", cd->host_connector_node_id.dw);
290+
comp_info(dev, "host_dma_id = 0x%08x", cd->host_connector_node_id.dw);
292291

293292
key = k_spin_lock(&drivers->lock);
294293
switch (cd->chain_task.state) {
@@ -302,7 +301,7 @@ static int chain_task_start(struct comp_dev *dev)
302301
case SOF_TASK_STATE_FREE:
303302
break;
304303
default:
305-
comp_err(dev, "chain_task_start(), bad state transition");
304+
comp_err(dev, "bad state transition");
306305
ret = -EINVAL;
307306
goto error;
308307
}
@@ -331,13 +330,13 @@ static int chain_task_start(struct comp_dev *dev)
331330
SOF_SCHEDULE_LL_TIMER, SOF_TASK_PRI_HIGH,
332331
chain_task_run, cd, 0, 0);
333332
if (ret < 0) {
334-
comp_err(dev, "chain_task_start(), ll task initialization failed");
333+
comp_err(dev, "ll task initialization failed");
335334
goto error_task;
336335
}
337336

338337
ret = schedule_task(&cd->chain_task, 0, 0);
339338
if (ret < 0) {
340-
comp_err(dev, "chain_task_start(), ll schedule task failed");
339+
comp_err(dev, "ll schedule task failed");
341340
schedule_task_free(&cd->chain_task);
342341
goto error_task;
343342
}
@@ -491,23 +490,23 @@ __cold static int chain_init(struct comp_dev *dev, void *addr, size_t length)
491490

492491
err = dma_config(cd->dma_host->z_dev, cd->chan_host->index, dma_cfg_host);
493492
if (err < 0) {
494-
comp_err(dev, "chain_init(): dma_config() failed");
493+
comp_err(dev, "dma_config() failed");
495494
goto error_host;
496495
}
497496

498497
/* get link DMA channel */
499498
channel = cd->link_connector_node_id.f.v_index;
500499
channel = dma_request_channel(cd->dma_link->z_dev, &channel);
501500
if (channel < 0) {
502-
comp_err(dev, "chain_init(): dma_request_channel() failed");
501+
comp_err(dev, "dma_request_channel() failed");
503502
goto error_host;
504503
}
505504

506505
cd->chan_link = &cd->dma_link->chan[channel];
507506

508507
err = dma_config(cd->dma_link->z_dev, cd->chan_link->index, dma_cfg_link);
509508
if (err < 0) {
510-
comp_err(dev, "chain_init(): dma_config() failed");
509+
comp_err(dev, "dma_config() failed");
511510
goto error_link;
512511
}
513512
return 0;
@@ -559,7 +558,7 @@ __cold static int chain_task_init(struct comp_dev *dev, uint8_t host_dma_id, uin
559558

560559
cd->dma_host = sof_dma_get(dir, 0, SOF_DMA_DEV_HOST, SOF_DMA_ACCESS_SHARED);
561560
if (!cd->dma_host) {
562-
comp_err(dev, "chain_task_init(): dma_get() returned NULL");
561+
comp_err(dev, "dma_get() returned NULL");
563562
return -EINVAL;
564563
}
565564

@@ -569,7 +568,7 @@ __cold static int chain_task_init(struct comp_dev *dev, uint8_t host_dma_id, uin
569568
cd->dma_link = sof_dma_get(dir, SOF_DMA_CAP_HDA, SOF_DMA_DEV_HDA, SOF_DMA_ACCESS_SHARED);
570569
if (!cd->dma_link) {
571570
sof_dma_put(cd->dma_host);
572-
comp_err(dev, "chain_task_init(): dma_get() returned NULL");
571+
comp_err(dev, "dma_get() returned NULL");
573572
return -EINVAL;
574573
}
575574

@@ -578,8 +577,7 @@ __cold static int chain_task_init(struct comp_dev *dev, uint8_t host_dma_id, uin
578577
&addr_align);
579578
if (ret < 0) {
580579
comp_err(dev,
581-
"chain_task_init(): could not get dma buffer address alignment, err = %d",
582-
ret);
580+
"could not get dma buffer address alignment, err = %d", ret);
583581
goto error;
584582
}
585583

@@ -609,7 +607,7 @@ __cold static int chain_task_init(struct comp_dev *dev, uint8_t host_dma_id, uin
609607
addr_align, false);
610608

611609
if (!cd->dma_buffer) {
612-
comp_err(dev, "chain_task_init(): failed to alloc dma buffer");
610+
comp_err(dev, "failed to alloc dma buffer");
613611
ret = -EINVAL;
614612
goto error;
615613
}

0 commit comments

Comments
 (0)