Skip to content

Commit 8773b83

Browse files
Copilotlyakh
andcommitted
Remove function names from logging calls in src/schedule, src/math, src/init, src/idc
Co-authored-by: lyakh <1363683+lyakh@users.noreply.github.com>
1 parent ef2516b commit 8773b83

11 files changed

Lines changed: 59 additions & 60 deletions

src/idc/idc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ static void idc_process_async_msg(uint32_t slot)
343343
#if CONFIG_AMS
344344
process_incoming_message(slot);
345345
#else
346-
tr_err(&idc_tr, "idc_cmd(): AMS not enabled");
346+
tr_err(&idc_tr, "AMS not enabled");
347347
#endif
348348
}
349349

@@ -430,7 +430,7 @@ void idc_cmd(struct idc_msg *msg)
430430
idc_process_async_msg(IDC_HEADER_TO_AMS_SLOT_MASK(msg->header));
431431
break;
432432
default:
433-
tr_err(&idc_tr, "idc_cmd(): invalid msg->header = %u",
433+
tr_err(&idc_tr, "invalid msg->header = %u",
434434
msg->header);
435435
}
436436

@@ -442,7 +442,7 @@ int idc_init(void)
442442
{
443443
struct idc **idc = idc_get();
444444

445-
tr_dbg(&idc_tr, "idc_init()");
445+
tr_dbg(&idc_tr, "");
446446

447447
/* initialize idc data */
448448
(*idc)->payload = platform_shared_get(static_payload, sizeof(static_payload));
@@ -469,7 +469,7 @@ int idc_restore(void)
469469
{
470470
struct idc **idc __unused = idc_get();
471471

472-
tr_info(&idc_tr, "idc_restore()");
472+
tr_info(&idc_tr, "");
473473

474474
/* idc_restore() is invoked during D0->D0ix/D0ix->D0 flow. In that
475475
* case basic core structures e.g. idc struct should be already

src/math/power.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ int32_t power_int32(int32_t b, int32_t e)
5656
multiplier = (int32_t)((1LL << 50) / (int64_t)b);
5757
} else {
5858
multiplier = INT32_MAX;
59-
tr_err(&math_power_tr, "power_int32(): Divide by zero error.");
59+
tr_err(&math_power_tr, "Divide by zero error.");
6060
}
6161
} else {
6262
multiplier = b;

src/schedule/dma_multi_chan_domain.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static int dma_multi_chan_domain_irq_register(struct dma_domain_data *data,
8686
{
8787
int ret;
8888

89-
tr_info(&ll_tr, "dma_multi_chan_domain_irq_register()");
89+
tr_info(&ll_tr, "");
9090

9191
/* always go through dma_multi_chan_domain_irq_handler,
9292
* so we have different arg registered for every channel
@@ -125,7 +125,7 @@ static int dma_multi_chan_domain_register(struct ll_schedule_domain *domain,
125125
int i;
126126
int j;
127127

128-
tr_info(&ll_tr, "dma_multi_chan_domain_register()");
128+
tr_info(&ll_tr, "");
129129

130130
/* check if task should be registered */
131131
if (!pipe_task->registrable)
@@ -192,7 +192,7 @@ static int dma_multi_chan_domain_register(struct ll_schedule_domain *domain,
192192
*/
193193
static void dma_multi_chan_domain_irq_unregister(struct dma_domain_data *data)
194194
{
195-
tr_info(&ll_tr, "dma_multi_chan_domain_irq_unregister()");
195+
tr_info(&ll_tr, "");
196196

197197
interrupt_disable(data->irq, data);
198198

@@ -217,7 +217,7 @@ static int dma_multi_chan_domain_unregister(struct ll_schedule_domain *domain,
217217
int i;
218218
int j;
219219

220-
tr_info(&ll_tr, "dma_multi_chan_domain_unregister()");
220+
tr_info(&ll_tr, "");
221221

222222
/* check if task should be unregistered */
223223
if (!task || !pipe_task->registrable)
@@ -365,19 +365,19 @@ struct ll_schedule_domain *dma_multi_chan_domain_init(struct dma *dma_array,
365365
int i;
366366
int j;
367367

368-
tr_info(&ll_tr, "dma_multi_chan_domain_init(): num_dma %d, clk %d, aggregated_irq %d",
368+
tr_info(&ll_tr, "num_dma %d, clk %d, aggregated_irq %d",
369369
num_dma, clk, aggregated_irq);
370370

371371
domain = domain_init(SOF_SCHEDULE_LL_DMA, clk, true,
372372
&dma_multi_chan_domain_ops);
373373
if (!domain) {
374-
tr_err(&ll_tr, "dma_multi_chan_domain_init(): domain init failed");
374+
tr_err(&ll_tr, "domain init failed");
375375
return NULL;
376376
}
377377

378378
dma_domain = rzalloc(SOF_MEM_FLAG_KERNEL | SOF_MEM_FLAG_COHERENT, sizeof(*dma_domain));
379379
if (!dma_domain) {
380-
tr_err(&ll_tr, "dma_multi_chan_domain_init(): allocation failed");
380+
tr_err(&ll_tr, "allocation failed");
381381
rfree(domain);
382382
return NULL;
383383
}

src/schedule/dma_single_chan_domain.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ static struct dma_chan_data *dma_chan_min_period(struct dma_domain *dma_domain)
101101
*/
102102
static void dma_domain_notify_change(struct dma_chan_data *channel)
103103
{
104-
tr_info(&ll_tr, "dma_domain_notify_change()");
104+
tr_info(&ll_tr, "");
105105

106106
notifier_event(channel, NOTIFIER_ID_DMA_DOMAIN_CHANGE,
107107
NOTIFIER_TARGET_CORE_ALL_MASK & ~BIT(cpu_get_id()),
@@ -124,7 +124,7 @@ static int dma_single_chan_domain_irq_register(struct dma_chan_data *channel,
124124
int irq = dma_chan_irq(channel->dma, channel->index);
125125
int ret;
126126

127-
tr_info(&ll_tr, "dma_single_chan_domain_irq_register()");
127+
tr_info(&ll_tr, "");
128128

129129
data->irq = interrupt_get_irq(irq, dma_irq_name(channel->dma));
130130
if (data->irq < 0) {
@@ -154,7 +154,7 @@ static int dma_single_chan_domain_irq_register(struct dma_chan_data *channel,
154154
*/
155155
static void dma_single_chan_domain_irq_unregister(struct dma_domain_data *data)
156156
{
157-
tr_info(&ll_tr, "dma_single_chan_domain_irq_unregister()");
157+
tr_info(&ll_tr, "");
158158

159159
interrupt_disable(data->irq, data->arg);
160160
interrupt_unregister(data->irq, data->arg);
@@ -188,7 +188,7 @@ static int dma_single_chan_domain_register(struct ll_schedule_domain *domain,
188188
bool register_needed = true;
189189
int ret = 0;
190190

191-
tr_info(&ll_tr, "dma_single_chan_domain_register()");
191+
tr_info(&ll_tr, "");
192192

193193
/* check if task should be registered */
194194
if (!pipe_task->registrable)
@@ -206,7 +206,7 @@ static int dma_single_chan_domain_register(struct ll_schedule_domain *domain,
206206
if (data->channel->period == channel->period)
207207
goto out;
208208

209-
tr_info(&ll_tr, "dma_single_chan_domain_register(): lower period detected, registering again");
209+
tr_info(&ll_tr, "lower period detected, registering again");
210210

211211
/* unregister from current channel */
212212
dma_single_chan_domain_irq_unregister(data);
@@ -221,11 +221,11 @@ static int dma_single_chan_domain_register(struct ll_schedule_domain *domain,
221221

222222
if (channel->period <= UINT_MAX)
223223
tr_info(&ll_tr,
224-
"dma_single_chan_domain_register(): registering on channel with period %u",
224+
"registering on channel with period %u",
225225
(unsigned int)channel->period);
226226
else
227227
tr_info(&ll_tr,
228-
"dma_single_chan_domain_register(): registering on channel with period > %u",
228+
"registering on channel with period > %u",
229229
UINT_MAX);
230230

231231
/* register for interrupt */
@@ -308,7 +308,7 @@ static void dma_domain_unregister_owner(struct ll_schedule_domain *domain,
308308
struct dma *dmas = dma_domain->dma_array;
309309
struct dma_chan_data *channel;
310310

311-
tr_info(&ll_tr, "dma_domain_unregister_owner()");
311+
tr_info(&ll_tr, "");
312312

313313
/* transfers still scheduled on this channel */
314314
if (data->channel->status == COMP_STATE_ACTIVE)
@@ -317,7 +317,7 @@ static void dma_domain_unregister_owner(struct ll_schedule_domain *domain,
317317
channel = dma_chan_min_period(dma_domain);
318318
if (channel && dma_chan_is_any_running(dmas, dma_domain->num_dma)) {
319319
/* another channel is running */
320-
tr_info(&ll_tr, "dma_domain_unregister_owner(): domain in use, change owner");
320+
tr_info(&ll_tr, "domain in use, change owner");
321321

322322
/* change owner */
323323
dma_domain->owner = channel->core;
@@ -369,7 +369,7 @@ static int dma_single_chan_domain_unregister(struct ll_schedule_domain *domain,
369369
int core = cpu_get_id();
370370
struct dma_domain_data *data = &dma_domain->data[core];
371371

372-
tr_info(&ll_tr, "dma_single_chan_domain_unregister()");
372+
tr_info(&ll_tr, "");
373373

374374
/* check if task should be unregistered */
375375
if (!task || !pipe_task->registrable)
@@ -505,7 +505,7 @@ static void dma_domain_changed(void *arg, enum notify_id type, void *data)
505505
int core = cpu_get_id();
506506
struct dma_domain_data *domain_data = &dma_domain->data[core];
507507

508-
tr_info(&ll_tr, "dma_domain_changed()");
508+
tr_info(&ll_tr, "");
509509

510510
/* unregister from current DMA channel */
511511
dma_single_chan_domain_irq_unregister(domain_data);
@@ -538,19 +538,19 @@ struct ll_schedule_domain *dma_single_chan_domain_init(struct dma *dma_array,
538538
struct ll_schedule_domain *domain;
539539
struct dma_domain *dma_domain;
540540

541-
tr_info(&ll_tr, "dma_single_chan_domain_init(): num_dma %d, clk %d",
541+
tr_info(&ll_tr, "num_dma %d, clk %d",
542542
num_dma, clk);
543543

544544
domain = domain_init(SOF_SCHEDULE_LL_DMA, clk, false,
545545
&dma_single_chan_domain_ops);
546546
if (!domain) {
547-
tr_err(&ll_tr, "dma_single_chan_domain_init(): domain init failed");
547+
tr_err(&ll_tr, "domain init failed");
548548
return NULL;
549549
}
550550

551551
dma_domain = rzalloc(SOF_MEM_FLAG_KERNEL | SOF_MEM_FLAG_COHERENT, sizeof(*dma_domain));
552552
if (!dma_domain) {
553-
tr_err(&ll_tr, "dma_single_chan_domain_init(): allocation failed");
553+
tr_err(&ll_tr, "allocation failed");
554554
rfree(domain);
555555
return NULL;
556556
}

src/schedule/ll_schedule.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ static int schedule_ll_domain_set(struct ll_schedule_data *sch,
365365

366366
ret = domain_register(domain, task, &schedule_ll_tasks_run, sch);
367367
if (ret < 0) {
368-
tr_err(&ll_tr, "schedule_ll_domain_set: cannot register domain %d",
368+
tr_err(&ll_tr, "cannot register domain %d",
369369
ret);
370370
goto done;
371371
}
@@ -548,7 +548,7 @@ static int schedule_ll_task_common(struct ll_schedule_data *sch, struct task *ta
548548
*/
549549
if (pdata->period < reg_pdata->period) {
550550
tr_err(&ll_tr,
551-
"schedule_ll_task(): registrable task has a period longer than current task");
551+
"registrable task has a period longer than current task");
552552
ret = -EINVAL;
553553
goto out;
554554
}
@@ -625,7 +625,7 @@ int schedule_task_init_ll(struct task *task,
625625
sizeof(*ll_pdata));
626626

627627
if (!ll_pdata) {
628-
tr_err(&ll_tr, "schedule_task_init_ll(): alloc failed");
628+
tr_err(&ll_tr, "alloc failed");
629629
return -ENOMEM;
630630
}
631631

@@ -714,7 +714,7 @@ static int reschedule_ll_task(void *data, struct task *task, uint64_t start)
714714
}
715715
}
716716

717-
tr_err(&ll_tr, "reschedule_ll_task(): task not found");
717+
tr_err(&ll_tr, "task not found");
718718

719719
out:
720720

@@ -783,7 +783,7 @@ int scheduler_init_ll(struct ll_schedule_domain *domain)
783783
/* initialize scheduler private data */
784784
sch = rzalloc(SOF_MEM_FLAG_KERNEL, sizeof(*sch));
785785
if (!sch) {
786-
tr_err(&ll_tr, "scheduler_init_ll(): allocation failed");
786+
tr_err(&ll_tr, "allocation failed");
787787
return -ENOMEM;
788788
}
789789
list_init(&sch->tasks);

src/schedule/schedule.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ int schedule_task_init(struct task *task,
2828
void *data, uint16_t core, uint32_t flags)
2929
{
3030
if (type >= SOF_SCHEDULE_COUNT) {
31-
tr_err(&sch_tr, "schedule_task_init(): invalid task type");
31+
tr_err(&sch_tr, "invalid task type");
3232
return -EINVAL;
3333
}
3434

@@ -53,7 +53,7 @@ static void scheduler_register(struct schedule_data *scheduler)
5353
*sch = rzalloc(SOF_MEM_FLAG_KERNEL,
5454
sizeof(**sch));
5555
if (!*sch) {
56-
tr_err(&sch_tr, "scheduler_register(): allocation failed");
56+
tr_err(&sch_tr, "allocation failed");
5757
return;
5858
}
5959
list_init(&(*sch)->list);
@@ -72,7 +72,7 @@ void scheduler_init(int type, const struct scheduler_ops *ops, void *data)
7272

7373
sch = rzalloc(SOF_MEM_FLAG_KERNEL, sizeof(*sch));
7474
if (!sch) {
75-
tr_err(&sch_tr, "scheduler_init(): allocation failed");
75+
tr_err(&sch_tr, "allocation failed");
7676
sof_panic(SOF_IPC_PANIC_IPC);
7777
}
7878
list_init(&sch->list);

src/schedule/zephyr_dma_domain.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,15 @@ struct ll_schedule_domain *zephyr_dma_domain_init(struct dma *dma_array,
120120
true,
121121
&zephyr_dma_domain_ops);
122122
if (!domain) {
123-
tr_err(&ll_tr, "zephyr_dma_domain_init(): domain init failed");
123+
tr_err(&ll_tr, "domain init failed");
124124
return NULL;
125125
}
126126

127127
/* initialize domain pdata */
128128
zephyr_dma_domain = rzalloc(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT,
129129
sizeof(*zephyr_dma_domain));
130130
if (!zephyr_dma_domain) {
131-
tr_err(&ll_tr, "zephyr_dma_domain_init(): allocation failed");
131+
tr_err(&ll_tr, "allocation failed");
132132
rfree(domain);
133133
return NULL;
134134
}
@@ -388,7 +388,7 @@ static int zephyr_dma_domain_register(struct ll_schedule_domain *domain,
388388
dt = zephyr_dma_domain->domain_thread + core;
389389
pipe_task = pipeline_task_get(task);
390390

391-
tr_info(&ll_tr, "zephyr_dma_domain_register()");
391+
tr_info(&ll_tr, "");
392392

393393
/* don't even bother trying to register DMA IRQ for
394394
* non-registrable tasks.
@@ -561,7 +561,7 @@ static int zephyr_dma_domain_unregister(struct ll_schedule_domain *domain,
561561
core = cpu_get_id();
562562
dt = zephyr_dma_domain->domain_thread + core;
563563

564-
tr_info(&ll_tr, "zephyr_dma_domain_unregister()");
564+
tr_info(&ll_tr, "");
565565

566566
/* unregister the DMA IRQ only for PPL tasks marked as "registrable"
567567
*

src/schedule/zephyr_domain.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static int zephyr_domain_register(struct ll_schedule_domain *domain,
178178
k_tid_t thread;
179179
k_spinlock_key_t key;
180180

181-
tr_dbg(&ll_tr, "zephyr_domain_register()");
181+
tr_dbg(&ll_tr, "");
182182

183183
/* domain work only needs registered once on each core */
184184
if (dt->handler)
@@ -233,7 +233,7 @@ static int zephyr_domain_unregister(struct ll_schedule_domain *domain,
233233
int core = cpu_get_id();
234234
k_spinlock_key_t key;
235235

236-
tr_dbg(&ll_tr, "zephyr_domain_unregister()");
236+
tr_dbg(&ll_tr, "");
237237

238238
/* tasks still registered on this core */
239239
if (num_tasks)
@@ -307,14 +307,14 @@ struct ll_schedule_domain *zephyr_domain_init(int clk)
307307
domain = domain_init(SOF_SCHEDULE_LL_TIMER, clk, false,
308308
&zephyr_domain_ops);
309309
if (!domain) {
310-
tr_err(&ll_tr, "zephyr_domain_init: domain init failed");
310+
tr_err(&ll_tr, "domain init failed");
311311
return NULL;
312312
}
313313

314314
zephyr_domain = rzalloc(SOF_MEM_FLAG_KERNEL | SOF_MEM_FLAG_COHERENT,
315315
sizeof(*zephyr_domain));
316316
if (!zephyr_domain) {
317-
tr_err(&ll_tr, "zephyr_domain_init: domain allocation failed");
317+
tr_err(&ll_tr, "domain allocation failed");
318318
rfree(domain);
319319
return NULL;
320320
}

0 commit comments

Comments
 (0)