Skip to content

Commit eeb1cdc

Browse files
Copilotlyakh
andcommitted
Remove function names from logging calls in src/ipc directory
Co-authored-by: lyakh <1363683+lyakh@users.noreply.github.com>
1 parent 0796a12 commit eeb1cdc

9 files changed

Lines changed: 79 additions & 79 deletions

File tree

src/ipc/dma-copy.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static struct dma_sg_elem *sg_get_elem_at(struct dma_sg_config *host_sg,
4646
}
4747

4848
/* host offset in beyond end of SG buffer */
49-
tr_err(&dmacpy_tr, "sg_get_elem_at(): host offset in beyond end of SG buffer");
49+
tr_err(&dmacpy_tr, "host offset in beyond end of SG buffer");
5050
return NULL;
5151
}
5252
#endif
@@ -165,15 +165,15 @@ int dma_copy_new(struct dma_copy *dc)
165165
cap = 0;
166166
dc->dmac = dma_get(dir, cap, dev, DMA_ACCESS_SHARED);
167167
if (!dc->dmac) {
168-
tr_err(&dmacpy_tr, "dma_copy_new(): dc->dmac = NULL");
168+
tr_err(&dmacpy_tr, "dc->dmac = NULL");
169169
return -ENODEV;
170170
}
171171

172172
#if !CONFIG_DMA_GW
173173
/* get DMA channel from DMAC0 */
174174
dc->chan = dma_channel_get_legacy(dc->dmac, CONFIG_TRACE_CHANNEL);
175175
if (!dc->chan) {
176-
tr_err(&dmacpy_tr, "dma_copy_new(): dc->chan is NULL");
176+
tr_err(&dmacpy_tr, "dc->chan is NULL");
177177
return -ENODEV;
178178
}
179179
#endif
@@ -186,7 +186,7 @@ int dma_copy_set_stream_tag(struct dma_copy *dc, uint32_t stream_tag)
186186
/* get DMA channel from DMAC */
187187
dc->chan = dma_channel_get_legacy(dc->dmac, stream_tag - 1);
188188
if (!dc->chan) {
189-
tr_err(&dmacpy_tr, "dma_copy_set_stream_tag(): dc->chan is NULL");
189+
tr_err(&dmacpy_tr, "dc->chan is NULL");
190190
return -EINVAL;
191191
}
192192

src/ipc/ipc-common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ int ipc_process_on_core(uint32_t core, bool blocking)
5151

5252
/* check if requested core is enabled */
5353
if (!cpu_is_core_enabled(core)) {
54-
tr_err(&ipc_tr, "ipc_process_on_core(): core #%d is disabled", core);
54+
tr_err(&ipc_tr, "core #%d is disabled", core);
5555
return -EACCES;
5656
}
5757

@@ -290,7 +290,7 @@ __cold int ipc_init(struct sof *sof)
290290
{
291291
assert_can_be_cold();
292292

293-
tr_dbg(&ipc_tr, "ipc_init()");
293+
tr_dbg(&ipc_tr, "");
294294

295295
/* init ipc data */
296296
sof->ipc = rzalloc(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT, sizeof(*sof->ipc));

src/ipc/ipc-helper.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ int comp_verify_params(struct comp_dev *dev, uint32_t flag,
140140
int dir = dev->direction;
141141

142142
if (!params) {
143-
comp_err(dev, "comp_verify_params(): !params");
143+
comp_err(dev, "!params");
144144
return -EINVAL;
145145
}
146146

@@ -263,14 +263,14 @@ int ipc_pipeline_complete(struct ipc *ipc, uint32_t comp_id)
263263
/* find the scheduling component */
264264
icd = ipc_get_comp_by_id(ipc, p->sched_id);
265265
if (!icd) {
266-
tr_warn(&ipc_tr, "ipc_pipeline_complete(): no scheduling component specified, use comp 0x%x",
266+
tr_warn(&ipc_tr, "no scheduling component specified, use comp 0x%x",
267267
ipc_ppl_sink->id);
268268

269269
icd = ipc_ppl_sink;
270270
}
271271

272272
if (icd->core != ipc_pipe->core) {
273-
tr_err(&ipc_tr, "ipc_pipeline_complete(): icd->core (%d) != ipc_pipe->core (%d) for pipeline scheduling component icd->id 0x%x",
273+
tr_err(&ipc_tr, "icd->core (%d) != ipc_pipe->core (%d) for pipeline scheduling component icd->id 0x%x",
274274
icd->core, ipc_pipe->core, icd->id);
275275
return -EINVAL;
276276
}
@@ -298,7 +298,7 @@ __cold int ipc_comp_free(struct ipc *ipc, uint32_t comp_id)
298298
/* check whether component exists */
299299
icd = ipc_get_comp_by_id(ipc, comp_id);
300300
if (!icd) {
301-
tr_err(&ipc_tr, "ipc_comp_free(): comp id: 0x%x is not found",
301+
tr_err(&ipc_tr, "comp id: 0x%x is not found",
302302
comp_id);
303303
return -ENODEV;
304304
}
@@ -309,7 +309,7 @@ __cold int ipc_comp_free(struct ipc *ipc, uint32_t comp_id)
309309

310310
/* check state */
311311
if (icd->cd->state != COMP_STATE_READY) {
312-
tr_err(&ipc_tr, "ipc_comp_free(): comp id: 0x%x state is %d cannot be freed",
312+
tr_err(&ipc_tr, "comp id: 0x%x state is %d cannot be freed",
313313
comp_id, icd->cd->state);
314314
return -EINVAL;
315315
}
@@ -328,7 +328,7 @@ __cold int ipc_comp_free(struct ipc *ipc, uint32_t comp_id)
328328
* leak on error. Bug-free host drivers won't do
329329
* this, this was found via fuzzing.
330330
*/
331-
tr_err(&ipc_tr, "ipc_comp_free(): uninitialized buffer lists on comp 0x%x\n",
331+
tr_err(&ipc_tr, "uninitialized buffer lists on comp 0x%x\n",
332332
icd->id);
333333
return -EINVAL;
334334
}

src/ipc/ipc3/dai.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ int dai_config_dma_channel(struct dai_data *dd, struct comp_dev *dev, const void
104104
break;
105105
default:
106106
/* other types of DAIs not handled for now */
107-
comp_err(dev, "dai_config_dma_channel(): Unknown dai type %d",
107+
comp_err(dev, "Unknown dai type %d",
108108
config->type);
109109
channel = SOF_DMA_CHAN_INVALID;
110110
break;
@@ -119,7 +119,7 @@ int ipc_dai_data_config(struct dai_data *dd, struct comp_dev *dev)
119119
struct sof_ipc_dai_config *config = ipc_from_dai_config(dd->dai_spec_config);
120120

121121
if (!config) {
122-
comp_err(dev, "dai_data_config(): no config set for dai %d type %d",
122+
comp_err(dev, "no config set for dai %d type %d",
123123
dai->dai_index, dai->type);
124124
return -EINVAL;
125125
}
@@ -129,14 +129,14 @@ int ipc_dai_data_config(struct dai_data *dd, struct comp_dev *dev)
129129

130130
/* cannot configure DAI while active */
131131
if (dev->state == COMP_STATE_ACTIVE) {
132-
comp_info(dev, "dai_data_config(): Component is in active state.");
132+
comp_info(dev, "Component is in active state.");
133133
return 0;
134134
}
135135

136136
/* validate direction */
137137
if (dai->direction != SOF_IPC_STREAM_PLAYBACK &&
138138
dai->direction != SOF_IPC_STREAM_CAPTURE) {
139-
comp_err(dev, "dai_data_config(): no direction set for dai %d type %d",
139+
comp_err(dev, "no direction set for dai %d type %d",
140140
dai->dai_index, dai->type);
141141
return -EINVAL;
142142
}
@@ -195,7 +195,7 @@ int ipc_dai_data_config(struct dai_data *dd, struct comp_dev *dev)
195195
break;
196196
default:
197197
/* other types of DAIs not handled for now */
198-
comp_warn(dev, "dai_data_config(): Unknown dai type %d",
198+
comp_warn(dev, "Unknown dai type %d",
199199
config->type);
200200
break;
201201
}
@@ -241,7 +241,7 @@ int ipc_comp_dai_config(struct ipc *ipc, struct ipc_config_dai *common_config,
241241
}
242242

243243
if (ret < 0) {
244-
tr_err(&ipc_tr, "ipc_comp_dai_config(): comp_dai_config() failed");
244+
tr_err(&ipc_tr, "comp_dai_config() failed");
245245
return ret;
246246
}
247247

@@ -281,7 +281,7 @@ void dai_dma_release(struct dai_data *dd, struct comp_dev *dev)
281281
{
282282
/* cannot configure DAI while active */
283283
if (dev->state == COMP_STATE_ACTIVE) {
284-
comp_info(dev, "dai_config(): Component is in active state. Ignore resetting");
284+
comp_info(dev, "Component is in active state. Ignore resetting");
285285
return;
286286
}
287287

@@ -315,7 +315,7 @@ int dai_config(struct dai_data *dd, struct comp_dev *dev, struct ipc_config_dai
315315

316316
/* cannot configure DAI while active */
317317
if (dev->state == COMP_STATE_ACTIVE) {
318-
comp_info(dev, "dai_config(): Component is in active state. Ignore config");
318+
comp_info(dev, "Component is in active state. Ignore config");
319319
return 0;
320320
}
321321

@@ -328,7 +328,7 @@ int dai_config(struct dai_data *dd, struct comp_dev *dev, struct ipc_config_dai
328328
dd->delayed_dma_stop = true;
329329

330330
if (dd->chan) {
331-
comp_info(dev, "dai_config(): Configured. dma channel index %d, ignore...",
331+
comp_info(dev, "Configured. dma channel index %d, ignore...",
332332
dd->chan->index);
333333
return 0;
334334
}
@@ -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, "dai_config(): No memory for dai_config.");
382+
comp_err(dev, "No memory for dai_config.");
383383
return -ENOMEM;
384384
}
385385
}

src/ipc/ipc3/handler.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -996,10 +996,10 @@ static inline int ipc_probe_init(uint32_t header)
996996
struct sof_ipc_probe_dma_add_params *params = ipc_get()->comp_data;
997997
int dma_provided = params->num_elems;
998998

999-
tr_dbg(&ipc_tr, "ipc_probe_init()");
999+
tr_dbg(&ipc_tr, "");
10001000

10011001
if (dma_provided > 1 || dma_provided < 0) {
1002-
ipc_cmd_err(&ipc_tr, "ipc_probe_init(): Invalid amount of extraction DMAs specified = %d",
1002+
ipc_cmd_err(&ipc_tr, "Invalid amount of extraction DMAs specified = %d",
10031003
dma_provided);
10041004
return -EINVAL;
10051005
}
@@ -1009,7 +1009,7 @@ static inline int ipc_probe_init(uint32_t header)
10091009

10101010
static inline int ipc_probe_deinit(uint32_t header)
10111011
{
1012-
tr_dbg(&ipc_tr, "ipc_probe_deinit()");
1012+
tr_dbg(&ipc_tr, "");
10131013

10141014
return probe_deinit();
10151015
}
@@ -1019,17 +1019,17 @@ static inline int ipc_probe_dma_add(uint32_t header)
10191019
struct sof_ipc_probe_dma_add_params *params = ipc_get()->comp_data;
10201020
int dmas_count = params->num_elems;
10211021

1022-
tr_dbg(&ipc_tr, "ipc_probe_dma_add()");
1022+
tr_dbg(&ipc_tr, "");
10231023

10241024
if (dmas_count > CONFIG_PROBE_DMA_MAX) {
1025-
ipc_cmd_err(&ipc_tr, "ipc_probe_dma_add(): Invalid amount of injection DMAs specified = %d. Max is "
1025+
ipc_cmd_err(&ipc_tr, "Invalid amount of injection DMAs specified = %d. Max is "
10261026
STRINGIFY(CONFIG_PROBE_DMA_MAX) ".",
10271027
dmas_count);
10281028
return -EINVAL;
10291029
}
10301030

10311031
if (dmas_count <= 0) {
1032-
ipc_cmd_err(&ipc_tr, "ipc_probe_dma_add(): Inferred amount of incjection DMAs in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.",
1032+
ipc_cmd_err(&ipc_tr, "Inferred amount of incjection DMAs in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.",
10331033
dmas_count);
10341034
return -EINVAL;
10351035
}
@@ -1042,17 +1042,17 @@ static inline int ipc_probe_dma_remove(uint32_t header)
10421042
struct sof_ipc_probe_dma_remove_params *params = ipc_get()->comp_data;
10431043
int tags_count = params->num_elems;
10441044

1045-
tr_dbg(&ipc_tr, "ipc_probe_dma_remove()");
1045+
tr_dbg(&ipc_tr, "");
10461046

10471047
if (tags_count > CONFIG_PROBE_DMA_MAX) {
1048-
ipc_cmd_err(&ipc_tr, "ipc_probe_dma_remove(): Invalid amount of injection DMAs specified = %d. Max is "
1048+
ipc_cmd_err(&ipc_tr, "Invalid amount of injection DMAs specified = %d. Max is "
10491049
STRINGIFY(CONFIG_PROBE_DMA_MAX) ".",
10501050
tags_count);
10511051
return -EINVAL;
10521052
}
10531053

10541054
if (tags_count <= 0) {
1055-
ipc_cmd_err(&ipc_tr, "ipc_probe_dma_remove(): Inferred amount of incjection DMAs in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.",
1055+
ipc_cmd_err(&ipc_tr, "Inferred amount of incjection DMAs in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.",
10561056
tags_count);
10571057
return -EINVAL;
10581058
}
@@ -1065,17 +1065,17 @@ static inline int ipc_probe_point_add(uint32_t header)
10651065
struct sof_ipc_probe_point_add_params *params = ipc_get()->comp_data;
10661066
int probes_count = params->num_elems;
10671067

1068-
tr_dbg(&ipc_tr, "ipc_probe_point_add()");
1068+
tr_dbg(&ipc_tr, "");
10691069

10701070
if (probes_count > CONFIG_PROBE_POINTS_MAX) {
1071-
ipc_cmd_err(&ipc_tr, "ipc_probe_point_add(): Invalid amount of Probe Points specified = %d. Max is "
1071+
ipc_cmd_err(&ipc_tr, "Invalid amount of Probe Points specified = %d. Max is "
10721072
STRINGIFY(CONFIG_PROBE_POINT_MAX) ".",
10731073
probes_count);
10741074
return -EINVAL;
10751075
}
10761076

10771077
if (probes_count <= 0) {
1078-
ipc_cmd_err(&ipc_tr, "ipc_probe_point_add(): Inferred amount of Probe Points in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.",
1078+
ipc_cmd_err(&ipc_tr, "Inferred amount of Probe Points in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.",
10791079
probes_count);
10801080
return -EINVAL;
10811081
}
@@ -1088,17 +1088,17 @@ static inline int ipc_probe_point_remove(uint32_t header)
10881088
struct sof_ipc_probe_point_remove_params *params = ipc_get()->comp_data;
10891089
int probes_count = params->num_elems;
10901090

1091-
tr_dbg(&ipc_tr, "ipc_probe_point_remove()");
1091+
tr_dbg(&ipc_tr, "");
10921092

10931093
if (probes_count > CONFIG_PROBE_POINTS_MAX) {
1094-
ipc_cmd_err(&ipc_tr, "ipc_probe_point_remove(): Invalid amount of Probe Points specified = %d. Max is "
1094+
ipc_cmd_err(&ipc_tr, "Invalid amount of Probe Points specified = %d. Max is "
10951095
STRINGIFY(CONFIG_PROBE_POINT_MAX) ".",
10961096
probes_count);
10971097
return -EINVAL;
10981098
}
10991099

11001100
if (probes_count <= 0) {
1101-
ipc_cmd_err(&ipc_tr, "ipc_probe_point_remove(): Inferred amount of Probe Points in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.",
1101+
ipc_cmd_err(&ipc_tr, "Inferred amount of Probe Points in payload is %d. This could indicate corrupt size reported in header or invalid IPC payload.",
11021102
probes_count);
11031103
return -EINVAL;
11041104
}
@@ -1111,7 +1111,7 @@ static int ipc_probe_info(uint32_t header)
11111111
struct sof_ipc_probe_info_params *params = ipc_get()->comp_data;
11121112
int ret;
11131113

1114-
tr_dbg(&ipc_tr, "ipc_probe_get_data()");
1114+
tr_dbg(&ipc_tr, "");
11151115

11161116
switch (cmd) {
11171117
case SOF_IPC_PROBE_DMA_INFO:
@@ -1121,13 +1121,13 @@ static int ipc_probe_info(uint32_t header)
11211121
ret = probe_point_info(params, SOF_IPC_MSG_MAX_SIZE);
11221122
break;
11231123
default:
1124-
ipc_cmd_err(&ipc_tr, "ipc_probe_info(): Invalid probe INFO command = %u",
1124+
ipc_cmd_err(&ipc_tr, "Invalid probe INFO command = %u",
11251125
cmd);
11261126
ret = -EINVAL;
11271127
}
11281128

11291129
if (ret < 0) {
1130-
ipc_cmd_err(&ipc_tr, "ipc_probe_info(): cmd %u failed", cmd);
1130+
ipc_cmd_err(&ipc_tr, "cmd %u failed", cmd);
11311131
return ret;
11321132
}
11331133

@@ -1138,7 +1138,7 @@ static int ipc_probe_info(uint32_t header)
11381138
mailbox_hostbox_write(0, params, params->rhdr.hdr.size);
11391139
ret = 1;
11401140
} else {
1141-
ipc_cmd_err(&ipc_tr, "ipc_probe_get_data(): probes module returned too much payload for cmd %u - returned %d bytes, max %d",
1141+
ipc_cmd_err(&ipc_tr, "probes module returned too much payload for cmd %u - returned %d bytes, max %d",
11421142
cmd, params->rhdr.hdr.size,
11431143
MIN(MAILBOX_HOSTBOX_SIZE, SOF_IPC_MSG_MAX_SIZE));
11441144
ret = -EINVAL;
@@ -1177,7 +1177,7 @@ static int ipc_glb_probe(uint32_t header)
11771177
#else
11781178
static inline int ipc_glb_probe(uint32_t header)
11791179
{
1180-
ipc_cmd_err(&ipc_tr, "ipc_glb_probe(): Probes not enabled by Kconfig.");
1180+
ipc_cmd_err(&ipc_tr, "Probes not enabled by Kconfig.");
11811181

11821182
return -EINVAL;
11831183
}

0 commit comments

Comments
 (0)