Skip to content

Commit 3cad157

Browse files
lyakhlyakh
committed
audio: remove function names from logging calls (5/8)
Remove verbatim function names for up_down_mixer, mixin_mixout, codec, crossover. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent 98b1321 commit 3cad157

4 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎src/audio/codec/dts/dts.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ dts_codec_process(struct processing_module *mod,
251251

252252
/* Proceed only if we have enough data to fill the module buffer completely */
253253
if (input_buffers[0].size < codec->mpd.in_buff_size) {
254-
comp_dbg(dev, "dts_codec_process(): not enough data to process");
254+
comp_dbg(dev, "not enough data to process");
255255
return -ENODATA;
256256
}
257257

@@ -425,34 +425,34 @@ dts_codec_set_configuration(struct processing_module *mod, uint32_t config_id,
425425
ret = module_set_configuration(mod, config_id, pos, data_offset_size, fragment,
426426
fragment_size, response, response_size);
427427
if (ret < 0) {
428-
comp_err(dev, "dts_codec_set_configuration(): error %x from module_set_configuration()",
428+
comp_err(dev, "error %x from module_set_configuration()",
429429
ret);
430430
return ret;
431431
}
432432

433433
/* return if more fragments are expected */
434434
if (pos != MODULE_CFG_FRAGMENT_LAST && pos != MODULE_CFG_FRAGMENT_SINGLE) {
435-
comp_err(dev, "dts_codec_set_configuration(): pos %d error", pos);
435+
comp_err(dev, "pos %d error", pos);
436436
return 0;
437437
}
438438

439439
#if CONFIG_IPC_MAJOR_3
440440
// return if the module is not prepared
441441
if (md->state < MODULE_INITIALIZED) {
442-
comp_err(dev, "dts_codec_set_configuration(): state %d error", md->state);
442+
comp_err(dev, "state %d error", md->state);
443443
return 0;
444444
}
445445
#endif
446446

447447
/* whole configuration received, apply it now */
448448
ret = dts_codec_apply_config(mod);
449449
if (ret) {
450-
comp_err(dev, "dts_codec_set_configuration(): error %x: runtime config apply failed",
450+
comp_err(dev, "error %x: runtime config apply failed",
451451
ret);
452452
return ret;
453453
}
454454

455-
comp_dbg(dev, "dts_codec_set_configuration(): config applied");
455+
comp_dbg(dev, "config applied");
456456

457457
return 0;
458458
}

‎src/audio/crossover/crossover.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,21 +321,21 @@ static int crossover_init(struct processing_module *mod)
321321
/* Handler for configuration data */
322322
cd->model_handler = comp_data_blob_handler_new(dev);
323323
if (!cd->model_handler) {
324-
comp_err(dev, "crossover_init(): comp_data_blob_handler_new() failed.");
324+
comp_err(dev, "comp_data_blob_handler_new() failed.");
325325
ret = -ENOMEM;
326326
goto cd_fail;
327327
}
328328

329329
/* Get configuration data and reset Crossover state */
330330
ret = comp_init_data_blob(cd->model_handler, bs, ipc_crossover->data);
331331
if (ret < 0) {
332-
comp_err(dev, "crossover_init(): comp_init_data_blob() failed.");
332+
comp_err(dev, "comp_init_data_blob() failed.");
333333
goto cd_fail;
334334
}
335335

336336
ret = crossover_output_pin_init(mod);
337337
if (ret < 0) {
338-
comp_err(dev, "crossover_init(): crossover_init_output_pins() failed.");
338+
comp_err(dev, "crossover_init_output_pins() failed.");
339339
goto cd_fail;
340340
}
341341

@@ -552,7 +552,7 @@ static int crossover_prepare(struct processing_module *mod,
552552
/* Validate frame format and buffer size of sinks */
553553
comp_dev_for_each_consumer(dev, sink) {
554554
if (cd->source_format != audio_stream_get_frm_fmt(&sink->stream)) {
555-
comp_err(dev, "crossover_prepare(): Source fmt %d and sink fmt %d are different.",
555+
comp_err(dev, "Source fmt %d and sink fmt %d are different.",
556556
cd->source_format, audio_stream_get_frm_fmt(&sink->stream));
557557
return -EINVAL;
558558
}

‎src/audio/mixin_mixout/mixin_mixout.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ static int mixin_process(struct processing_module *mod,
306306
sinks_free_frames = INT32_MAX;
307307

308308
if (num_of_sinks > MIXIN_MAX_SINKS) {
309-
comp_err(dev, "mixin_process(): Invalid output sink count %d",
309+
comp_err(dev, "Invalid output sink count %d",
310310
num_of_sinks);
311311
return -EINVAL;
312312
}
@@ -673,7 +673,7 @@ static int mixin_params(struct processing_module *mod)
673673

674674
ret = comp_verify_params(dev, 0, params);
675675
if (ret < 0) {
676-
comp_err(dev, "mixin_params(): comp_verify_params() failed!");
676+
comp_err(dev, "comp_verify_params() failed!");
677677
return -EINVAL;
678678
}
679679

@@ -738,7 +738,7 @@ static int mixout_params(struct processing_module *mod)
738738

739739
ret = comp_verify_params(dev, 0, params);
740740
if (ret < 0) {
741-
comp_err(dev, "mixout_params(): comp_verify_params() failed!");
741+
comp_err(dev, "comp_verify_params() failed!");
742742
return -EINVAL;
743743
}
744744

@@ -910,14 +910,14 @@ static int mixin_set_config(struct processing_module *mod, uint32_t config_id,
910910
if (sizeof(struct ipc4_mixer_mode_config) +
911911
(cfg->mixer_mode_config_count - 1) * sizeof(struct ipc4_mixer_mode_sink_config) >
912912
data_offset_size) {
913-
comp_err(dev, "mixin_set_config(): unexpected data size: %u", data_offset_size);
913+
comp_err(dev, "unexpected data size: %u", data_offset_size);
914914
return -EINVAL;
915915
}
916916

917917
for (i = 0; i < cfg->mixer_mode_config_count; i++) {
918918
sink_index = cfg->mixer_mode_sink_configs[i].output_queue_id;
919919
if (sink_index >= MIXIN_MAX_SINKS) {
920-
comp_err(dev, "mixin_set_config(): invalid sink index: %u", sink_index);
920+
comp_err(dev, "invalid sink index: %u", sink_index);
921921
return -EINVAL;
922922
}
923923

@@ -926,15 +926,15 @@ static int mixin_set_config(struct processing_module *mod, uint32_t config_id,
926926
gain = IPC4_MIXIN_UNITY_GAIN;
927927
mixin_data->sink_config[sink_index].gain = gain;
928928

929-
comp_dbg(dev, "mixin_set_config(): gain 0x%x will be applied for sink %u",
929+
comp_dbg(dev, "gain 0x%x will be applied for sink %u",
930930
gain, sink_index);
931931

932932
if (cfg->mixer_mode_sink_configs[i].mixer_mode ==
933933
IPC4_MIXER_CHANNEL_REMAPPING_MODE) {
934934
uint32_t channel_count =
935935
cfg->mixer_mode_sink_configs[i].output_channel_count;
936936
if (channel_count < 1 || channel_count > 8) {
937-
comp_err(dev, "mixin_set_config(): Invalid output_channel_count %u for sink %u",
937+
comp_err(dev, "Invalid output_channel_count %u for sink %u",
938938
channel_count, sink_index);
939939
return -EINVAL;
940940
}
@@ -943,7 +943,7 @@ static int mixin_set_config(struct processing_module *mod, uint32_t config_id,
943943
mixin_data->sink_config[sink_index].output_channel_map =
944944
cfg->mixer_mode_sink_configs[i].output_channel_map;
945945

946-
comp_dbg(dev, "mixin_set_config(): output_channel_count: %u, chmap: 0x%x for sink: %u",
946+
comp_dbg(dev, "output_channel_count: %u, chmap: 0x%x for sink: %u",
947947
channel_count,
948948
mixin_data->sink_config[sink_index].output_channel_map,
949949
sink_index);

‎src/audio/up_down_mixer/up_down_mixer.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static int set_downmix_coefficients(struct processing_module *mod,
100100
cd->downmix_coefficients = k_scaled_lo_ro_downmix32bit;
101101
break;
102102
default:
103-
comp_err(dev, "set_downmix_coefficients(): invalid channel config.");
103+
comp_err(dev, "invalid channel config.");
104104
return -EINVAL;
105105
}
106106

@@ -128,7 +128,7 @@ static up_down_mixer_routine select_mix_out_stereo(struct comp_dev *dev,
128128
return downmix16bit_5_1;
129129
case IPC4_CHANNEL_CONFIG_INVALID:
130130
default:
131-
comp_err(dev, "select_mix_out_stereo(): invalid channel config.");
131+
comp_err(dev, "invalid channel config.");
132132
/*
133133
* This is a strange situation. We will allow to process it
134134
* in the release code (hoping for the best) with downmix16bit,
@@ -161,7 +161,7 @@ static up_down_mixer_routine select_mix_out_stereo(struct comp_dev *dev,
161161
return downmix32bit_7_1;
162162
case IPC4_CHANNEL_CONFIG_INVALID:
163163
default:
164-
comp_err(dev, "select_mix_out_stereo(): invalid channel config.");
164+
comp_err(dev, "invalid channel config.");
165165
/*
166166
* This is a strange situation. We will allow to process it
167167
* in the release code (hoping for the best) with downmix32bit,
@@ -185,7 +185,7 @@ static up_down_mixer_routine select_mix_out_mono(struct comp_dev *dev,
185185
return downmix16bit_4ch_mono;
186186
case IPC4_CHANNEL_CONFIG_INVALID:
187187
default:
188-
comp_err(dev, "select_mix_out_mono(): invalid channel config.");
188+
comp_err(dev, "invalid channel config.");
189189
/*
190190
* This is a strange situation. We will allow to process it
191191
* in the release code (hoping for the best) with downmix16bit,
@@ -212,7 +212,7 @@ static up_down_mixer_routine select_mix_out_mono(struct comp_dev *dev,
212212
return downmix32bit_7_1_mono;
213213
case IPC4_CHANNEL_CONFIG_INVALID:
214214
default:
215-
comp_err(dev, "select_mix_out_mono(): invalid channel config.");
215+
comp_err(dev, "invalid channel config.");
216216
/*
217217
* This is a strange situation. We will allow to process it
218218
* in the release code (hoping for the best) with downmix32bit,
@@ -234,7 +234,7 @@ static up_down_mixer_routine select_mix_out_5_1(struct comp_dev *dev,
234234
return upmix16bit_2_0_to_5_1;
235235
case IPC4_CHANNEL_CONFIG_INVALID:
236236
default:
237-
comp_err(dev, "select_mix_out_5_1(): invalid channel config.");
237+
comp_err(dev, "invalid channel config.");
238238
return NULL;
239239
}
240240
} else {
@@ -251,7 +251,7 @@ static up_down_mixer_routine select_mix_out_5_1(struct comp_dev *dev,
251251
return downmix32bit_7_1_to_5_1;
252252
case IPC4_CHANNEL_CONFIG_INVALID:
253253
default:
254-
comp_err(dev, "select_mix_out_5_1(): invalid channel config.");
254+
comp_err(dev, "invalid channel config.");
255255
return NULL;
256256
}
257257
}
@@ -379,13 +379,13 @@ static int up_down_mixer_init(struct processing_module *mod)
379379
up_down_mixer->out_channel_config, up_down_mixer->coefficients);
380380
break;
381381
default:
382-
comp_err(dev, "up_down_mixer_init(): unsupported coefficient type");
382+
comp_err(dev, "unsupported coefficient type");
383383
ret = -EINVAL;
384384
break;
385385
}
386386

387387
if (ret < 0) {
388-
comp_err(dev, "up_down_mixer_init(): failed to initialize up_down_mix");
388+
comp_err(dev, "failed to initialize up_down_mix");
389389
goto err;
390390
}
391391

0 commit comments

Comments
 (0)