Skip to content

Commit d213499

Browse files
lyakhkv2019i
lyakh
authored and
kv2019i
committed
drivers: 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 3bd09e8 commit d213499

13 files changed

Lines changed: 85 additions & 86 deletions

File tree

‎src/drivers/amd/rembrandt/acp_hs_dai.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static inline int hsdai_set_config(struct dai *dai, struct ipc_config_dai *commo
6060
i2stdm_mstrclkgen.bits.i2stdm_bclk_div_val = 0x20;
6161
break;
6262
default:
63-
dai_err(dai, "hsdai_set_config unsupported slots");
63+
dai_err(dai, "unsupported slots");
6464
return -EINVAL;
6565
}
6666
break;
@@ -70,7 +70,7 @@ static inline int hsdai_set_config(struct dai *dai, struct ipc_config_dai *commo
7070
i2stdm_mstrclkgen.bits.i2stdm_bclk_div_val = 0x80;
7171
break;
7272
default:
73-
dai_err(dai, "hsdai_set_config invalid format");
73+
dai_err(dai, "invalid format");
7474
return -EINVAL;
7575
}
7676

@@ -109,7 +109,7 @@ static inline int hsdai_set_config(struct dai *dai, struct ipc_config_dai *commo
109109
io_reg_write((PU_REGISTER_BASE + ACP_HSTDM_IRER), hs_irer.u32all);
110110
break;
111111
default:
112-
dai_err(dai, "hsdai_set_config invalid format");
112+
dai_err(dai, "invalid format");
113113
return -EINVAL;
114114
}
115115
return 0;

‎src/drivers/amd/rembrandt/acp_sw_audio_dai.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static int swaudiodai_remove(struct dai *dai)
5151
{
5252
struct acp_pdata *acp = dai_get_drvdata(dai);
5353

54-
dai_info(dai, "swaudiodai_remove");
54+
dai_info(dai, "entry");
5555
rfree(acp);
5656
dai_set_drvdata(dai, NULL);
5757

‎src/drivers/amd/renoir/acp_sp_dai.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static int spdai_get_fifo(struct dai *dai, int direction, int stream_id)
110110
case DAI_DIR_CAPTURE:
111111
return dai_fifo(dai, direction);
112112
default:
113-
dai_err(dai, "spdai_get_fifo(): Invalid direction");
113+
dai_err(dai, "Invalid direction");
114114
return -EINVAL;
115115
}
116116
}

‎src/drivers/amd/vangogh/acp_hs_dma.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ static int acp_dai_hs_dma_copy(struct dma_chan_data *channel, int bytes,
279279
.channel = channel,
280280
.elem.size = bytes,
281281
};
282-
tr_info(&acp_hs_tr, "acp_dai_hs_dma_copy ");
282+
tr_info(&acp_hs_tr, "entry");
283283
notifier_event(channel, NOTIFIER_ID_DMA_COPY,
284284
NOTIFIER_TARGET_CORE_LOCAL, &next, sizeof(next));
285285
return 0;

‎src/drivers/dw/dma.c‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ static void dw_dma_channel_put(struct dma_chan_data *channel)
254254
{
255255
k_spinlock_key_t key;
256256

257-
tr_info(&dwdma_tr, "dw_dma_channel_put(): dma %d channel %d put",
257+
tr_info(&dwdma_tr, "dma %d channel %d put",
258258
channel->dma->plat_data.id, channel->index);
259259

260260
key = k_spin_lock(&channel->dma->lock);
@@ -273,7 +273,7 @@ static int dw_dma_start(struct dma_chan_data *channel)
273273
uint32_t words_per_tfr = 0;
274274
#endif
275275

276-
tr_dbg(&dwdma_tr, "dw_dma_start(): dma %d channel %d start",
276+
tr_dbg(&dwdma_tr, "dma %d channel %d start",
277277
channel->dma->plat_data.id, channel->index);
278278

279279
irq_local_disable(flags);
@@ -282,7 +282,7 @@ static int dw_dma_start(struct dma_chan_data *channel)
282282
if ((channel->status != COMP_STATE_PREPARE &&
283283
channel->status != COMP_STATE_PAUSED) ||
284284
(dma_reg_read(dma, DW_DMA_CHAN_EN) & DW_CHAN(channel->index))) {
285-
tr_err(&dwdma_tr, "dw_dma_start(): dma %d channel %d not ready ena 0x%x status 0x%x",
285+
tr_err(&dwdma_tr, "dma %d channel %d not ready ena 0x%x status 0x%x",
286286
dma->plat_data.id, channel->index,
287287
dma_reg_read(dma, DW_DMA_CHAN_EN),
288288
channel->status);
@@ -292,7 +292,7 @@ static int dw_dma_start(struct dma_chan_data *channel)
292292

293293
/* is valid stream */
294294
if (!dw_chan->lli) {
295-
tr_err(&dwdma_tr, "dw_dma_start(): dma %d channel %d invalid stream",
295+
tr_err(&dwdma_tr, "dma %d channel %d invalid stream",
296296
dma->plat_data.id, channel->index);
297297
ret = -EINVAL;
298298
goto out;
@@ -348,7 +348,7 @@ static int dw_dma_release(struct dma_chan_data *channel)
348348
struct dw_dma_chan_data *dw_chan = dma_chan_get_data(channel);
349349
uint32_t flags;
350350

351-
tr_info(&dwdma_tr, "dw_dma_release(): dma %d channel %d release",
351+
tr_info(&dwdma_tr, "dma %d channel %d release",
352352
channel->dma->plat_data.id, channel->index);
353353

354354
irq_local_disable(flags);
@@ -370,7 +370,7 @@ static int dw_dma_pause(struct dma_chan_data *channel)
370370
struct dma *dma = channel->dma;
371371
uint32_t flags;
372372

373-
tr_info(&dwdma_tr, "dw_dma_pause(): dma %d channel %d pause",
373+
tr_info(&dwdma_tr, "dma %d channel %d pause",
374374
channel->dma->plat_data.id, channel->index);
375375

376376
irq_local_disable(flags);
@@ -405,7 +405,7 @@ static int dw_dma_stop(struct dma_chan_data *channel)
405405
int i;
406406
#endif
407407

408-
tr_info(&dwdma_tr, "dw_dma_stop(): dma %d channel %d stop",
408+
tr_info(&dwdma_tr, "dma %d channel %d stop",
409409
dma->plat_data.id, channel->index);
410410

411411
irq_local_disable(flags);
@@ -428,7 +428,7 @@ static int dw_dma_stop(struct dma_chan_data *channel)
428428
DW_CFGL_FIFO_EMPTY,
429429
DW_DMA_TIMEOUT);
430430
if (ret < 0)
431-
tr_err(&dwdma_tr, "dw_dma_stop(): dma %d channel %d timeout",
431+
tr_err(&dwdma_tr, "dma %d channel %d timeout",
432432
dma->plat_data.id, channel->index);
433433
#endif
434434

@@ -438,7 +438,7 @@ static int dw_dma_stop(struct dma_chan_data *channel)
438438
ret = poll_for_register_delay(dma_base(dma) + DW_DMA_CHAN_EN,
439439
DW_CHAN(channel->index), 0, DW_DMA_TIMEOUT);
440440
if (ret < 0) {
441-
tr_err(&dwdma_tr, "dw_dma_stop(): dma %d channel %d disable timeout",
441+
tr_err(&dwdma_tr, "dma %d channel %d disable timeout",
442442
dma->plat_data.id, channel->index);
443443
return -ETIMEDOUT;
444444
}
@@ -499,7 +499,7 @@ static int dw_dma_set_config(struct dma_chan_data *channel,
499499
int ret = 0;
500500
int i;
501501

502-
tr_dbg(&dwdma_tr, "dw_dma_set_config(): dma %d channel %d config",
502+
tr_dbg(&dwdma_tr, "dma %d channel %d config",
503503
channel->dma->plat_data.id, channel->index);
504504

505505
irq_local_disable(flags);
@@ -514,15 +514,15 @@ static int dw_dma_set_config(struct dma_chan_data *channel,
514514
dw_chan->cfg_hi = DW_CFG_HIGH_DEF;
515515

516516
if (!config->elem_array.count) {
517-
tr_err(&dwdma_tr, "dw_dma_set_config(): dma %d channel %d no elems",
517+
tr_err(&dwdma_tr, "dma %d channel %d no elems",
518518
channel->dma->plat_data.id, channel->index);
519519
ret = -EINVAL;
520520
goto out;
521521
}
522522

523523
if (config->irq_disabled &&
524524
config->elem_array.count < DW_DMA_CFG_NO_IRQ_MIN_ELEMS) {
525-
tr_err(&dwdma_tr, "dw_dma_set_config(): dma %d channel %d not enough elems for config with irq disabled %d",
525+
tr_err(&dwdma_tr, "dma %d channel %d not enough elems for config with irq disabled %d",
526526
channel->dma->plat_data.id,
527527
channel->index, config->elem_array.count);
528528
ret = -EINVAL;
@@ -548,7 +548,7 @@ static int dw_dma_set_config(struct dma_chan_data *channel,
548548
dw_chan->lli = rmalloc(SOF_MEM_FLAG_KERNEL | SOF_MEM_FLAG_COHERENT | SOF_MEM_FLAG_DMA,
549549
sizeof(struct dw_lli) * channel->desc_count);
550550
if (!dw_chan->lli) {
551-
tr_err(&dwdma_tr, "dw_dma_set_config(): dma %d channel %d lli alloc failed",
551+
tr_err(&dwdma_tr, "dma %d channel %d lli alloc failed",
552552
channel->dma->plat_data.id,
553553
channel->index);
554554
ret = -ENOMEM;
@@ -600,7 +600,7 @@ static int dw_dma_set_config(struct dma_chan_data *channel,
600600
lli_desc->ctrl_lo |= DW_CTLL_SRC_WIDTH(2);
601601
break;
602602
default:
603-
tr_err(&dwdma_tr, "dw_dma_set_config(): dma %d channel %d invalid src width %d",
603+
tr_err(&dwdma_tr, "dma %d channel %d invalid src width %d",
604604
channel->dma->plat_data.id,
605605
channel->index, config->src_width);
606606
ret = -EINVAL;
@@ -628,7 +628,7 @@ static int dw_dma_set_config(struct dma_chan_data *channel,
628628
lli_desc->ctrl_lo |= DW_CTLL_DST_WIDTH(2);
629629
break;
630630
default:
631-
tr_err(&dwdma_tr, "dw_dma_set_config(): dma %d channel %d invalid dest width %d",
631+
tr_err(&dwdma_tr, "dma %d channel %d invalid dest width %d",
632632
channel->dma->plat_data.id,
633633
channel->index, config->dest_width);
634634
ret = -EINVAL;
@@ -706,7 +706,7 @@ static int dw_dma_set_config(struct dma_chan_data *channel,
706706
DW_CFGH_DST(config->dest_dev);
707707
break;
708708
default:
709-
tr_err(&dwdma_tr, "dw_dma_set_config(): dma %d channel %d invalid direction %d",
709+
tr_err(&dwdma_tr, "dma %d channel %d invalid direction %d",
710710
channel->dma->plat_data.id,
711711
channel->index, config->direction);
712712
ret = -EINVAL;
@@ -717,7 +717,7 @@ static int dw_dma_set_config(struct dma_chan_data *channel,
717717
lli_desc->dar = sg_elem->dest;
718718

719719
if (sg_elem->size > DW_CTLH_BLOCK_TS_MASK) {
720-
tr_err(&dwdma_tr, "dw_dma_set_config(): dma %d channel %d block size too big %d",
720+
tr_err(&dwdma_tr, "dma %d channel %d block size too big %d",
721721
channel->dma->plat_data.id,
722722
channel->index, sg_elem->size);
723723
ret = -EINVAL;
@@ -839,7 +839,7 @@ static int dw_dma_copy(struct dma_chan_data *channel, int bytes,
839839
};
840840
k_spinlock_key_t key;
841841

842-
tr_dbg(&dwdma_tr, "dw_dma_copy(): dma %d channel %d copy",
842+
tr_dbg(&dwdma_tr, "dma %d channel %d copy",
843843
channel->dma->plat_data.id, channel->index);
844844

845845
notifier_event(channel, NOTIFIER_ID_DMA_COPY,
@@ -859,7 +859,7 @@ static int dw_dma_copy(struct dma_chan_data *channel, int bytes,
859859
DW_CHAN(channel->index), 0,
860860
DW_DMA_TIMEOUT);
861861
if (ret < 0) {
862-
tr_dbg(&dwdma_tr, "dw_dma_copy(): poll_for_register_delay timeout");
862+
tr_dbg(&dwdma_tr, "poll_for_register_delay timeout");
863863
return ret;
864864
}
865865
}
@@ -888,7 +888,7 @@ static int dw_dma_setup(struct dma *dma)
888888
break;
889889

890890
if (!i) {
891-
tr_err(&dwdma_tr, "dw_dma_setup(): dma %d setup failed",
891+
tr_err(&dwdma_tr, "dma %d setup failed",
892892
dma->plat_data.id);
893893
return -EIO;
894894
}
@@ -940,7 +940,7 @@ static int dw_dma_probe(struct dma *dma)
940940
sizeof(struct dma_chan_data) * dma->plat_data.channels);
941941

942942
if (!dma->chan) {
943-
tr_err(&dwdma_tr, "dw_dma_probe(): dma %d allocaction of channels failed",
943+
tr_err(&dwdma_tr, "dma %d allocation of channels failed",
944944
dma->plat_data.id);
945945
goto out;
946946
}
@@ -961,7 +961,7 @@ static int dw_dma_probe(struct dma *dma)
961961
sizeof(*dw_chan));
962962

963963
if (!dw_chan) {
964-
tr_err(&dwdma_tr, "dw_dma_probe(): dma %d allocaction of channel %d private data failed",
964+
tr_err(&dwdma_tr, "dma %d allocation of channel %d private data failed",
965965
dma->plat_data.id, i);
966966
goto out;
967967
}
@@ -989,7 +989,7 @@ static int dw_dma_remove(struct dma *dma)
989989
{
990990
int i;
991991

992-
tr_dbg(&dwdma_tr, "dw_dma_remove(): dma %d remove", dma->plat_data.id);
992+
tr_dbg(&dwdma_tr, "dma %d remove", dma->plat_data.id);
993993

994994
pm_runtime_put_sync(DW_DMAC_CLK, dma->plat_data.id);
995995

@@ -1024,7 +1024,7 @@ static int dw_dma_avail_data_size(struct dma_chan_data *channel)
10241024
if (delta)
10251025
size = dw_chan->ptr_data.buffer_bytes;
10261026
else
1027-
tr_info(&dwdma_tr, "dw_dma_avail_data_size() size is 0!");
1027+
tr_info(&dwdma_tr, "size is 0!");
10281028
}
10291029

10301030
tr_dbg(&dwdma_tr, "DAR %x reader 0x%x free 0x%x avail 0x%x", write_ptr,
@@ -1055,7 +1055,7 @@ static int dw_dma_free_data_size(struct dma_chan_data *channel)
10551055
if (delta)
10561056
size = dw_chan->ptr_data.buffer_bytes;
10571057
else
1058-
tr_info(&dwdma_tr, "dw_dma_free_data_size() size is 0!");
1058+
tr_info(&dwdma_tr, "size is 0!");
10591059
}
10601060

10611061
tr_dbg(&dwdma_tr, "SAR %x writer 0x%x free 0x%x avail 0x%x", read_ptr,
@@ -1071,7 +1071,7 @@ static int dw_dma_get_data_size(struct dma_chan_data *channel,
10711071
k_spinlock_key_t key;
10721072
int ret = 0;
10731073

1074-
tr_dbg(&dwdma_tr, "dw_dma_get_data_size(): dma %d channel %d get data size",
1074+
tr_dbg(&dwdma_tr, "dma %d channel %d get data size",
10751075
channel->dma->plat_data.id, channel->index);
10761076

10771077
key = k_spin_lock(&channel->dma->lock);
@@ -1090,7 +1090,7 @@ static int dw_dma_get_data_size(struct dma_chan_data *channel,
10901090
#if CONFIG_DMA_HW_LLI
10911091
if (!(dma_reg_read(channel->dma, DW_DMA_CHAN_EN) &
10921092
DW_CHAN(channel->index))) {
1093-
tr_err(&dwdma_tr, "dw_dma_get_data_size(): xrun detected");
1093+
tr_err(&dwdma_tr, "xrun detected");
10941094
return -ENODATA;
10951095
}
10961096
#endif

‎src/drivers/imx/edma.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ static int edma_set_config(struct dma_chan_data *channel,
391391
doff = config->dest_width;
392392
break;
393393
default:
394-
tr_err(&edma_tr, "edma_set_config() unsupported config direction");
394+
tr_err(&edma_tr, "unsupported config direction");
395395
return -EINVAL;
396396
}
397397

@@ -541,7 +541,7 @@ static int edma_get_data_size(struct dma_chan_data *channel,
541541
*avail = ABS(capture_data_size) / 2;
542542
break;
543543
default:
544-
tr_err(&edma_tr, "edma_get_data_size() unsupported direction %d",
544+
tr_err(&edma_tr, "unsupported direction %d",
545545
channel->direction);
546546
return -EINVAL;
547547
}

‎src/drivers/imx/esai.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ static int esai_remove(struct dai *dai)
367367
{
368368
struct esai_pdata *pdata = dai_get_drvdata(dai);
369369

370-
dai_info(dai, "esai_remove()");
370+
dai_info(dai, "entry");
371371

372372
rfree(pdata);
373373
dai_set_drvdata(dai, NULL);
@@ -391,7 +391,7 @@ static int esai_get_fifo(struct dai *dai, int direction, int stream_id)
391391
case DAI_DIR_CAPTURE:
392392
return dai_fifo(dai, direction); /* stream_id is unused */
393393
default:
394-
dai_err(dai, "esai_get_fifo(): Invalid direction");
394+
dai_err(dai, "Invalid direction");
395395
return -EINVAL;
396396
}
397397
}
@@ -403,7 +403,7 @@ static int esai_get_fifo_depth(struct dai *dai, int direction)
403403
case DAI_DIR_CAPTURE:
404404
return dai->plat_data.fifo[direction].depth;
405405
default:
406-
dai_err(dai, "esai_get_fifo_depth(): Invalid direction");
406+
dai_err(dai, "Invalid direction");
407407
return -EINVAL;
408408
}
409409
}
@@ -420,7 +420,7 @@ static int esai_get_hw_params(struct dai *dai,
420420
params->buffer_fmt = 0;
421421
params->frame_fmt = SOF_IPC_FRAME_S24_4LE;
422422

423-
dai_info(dai, "esai_get_hw_params(): params->rate = %d, fsync_rate = %d",
423+
dai_info(dai, "params->rate = %d, fsync_rate = %d",
424424
params->rate, esai->params.fsync_rate);
425425

426426
return 0;

‎src/drivers/imx/interrupt-irqsteer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ static inline void irq_handler(void *data, uint32_t line_index)
348348

349349
if (!--tries) {
350350
tries = IRQ_MAX_TRIES;
351-
tr_err(&irq_i_tr, "irq_handler(): IRQ storm, status 0x%08x%08x",
351+
tr_err(&irq_i_tr, "IRQ storm, status 0x%08x%08x",
352352
(uint32_t)(status >> 32), (uint32_t)status);
353353
}
354354
}

0 commit comments

Comments
 (0)