Skip to content

Commit a27e3c8

Browse files
lyakhlgirdwood
lyakh
authored and
lgirdwood
committed
audio: remove function names from logging calls (3/8)
Remove verbatim function names for tensorflow, google, eq_iir. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent 4edce44 commit a27e3c8

10 files changed

Lines changed: 58 additions & 58 deletions

‎src/audio/eq_iir/eq_iir.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ static int eq_iir_init(struct processing_module *mod)
6969
/* component model data handler */
7070
cd->model_handler = comp_data_blob_handler_new(dev);
7171
if (!cd->model_handler) {
72-
comp_err(dev, "eq_iir_init(): comp_data_blob_handler_new() failed.");
72+
comp_err(dev, "comp_data_blob_handler_new() failed.");
7373
ret = -ENOMEM;
7474
goto err;
7575
}
@@ -79,7 +79,7 @@ static int eq_iir_init(struct processing_module *mod)
7979
*/
8080
ret = comp_init_data_blob(cd->model_handler, bs, cfg->data);
8181
if (ret < 0) {
82-
comp_err(dev, "eq_iir_init(): comp_init_data_blob() failed with error: %d", ret);
82+
comp_err(dev, "comp_init_data_blob() failed with error: %d", ret);
8383
comp_data_blob_handler_free(cd->model_handler);
8484
goto err;
8585
}

‎src/audio/eq_iir/eq_iir_generic.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ static int eq_iir_init_coef(struct processing_module *mod, int nch)
195195
int j;
196196
int s;
197197

198-
comp_info(mod->dev, "eq_iir_init_coef(): %u responses, %u channels, stream %d channels",
198+
comp_info(mod->dev, "%u responses, %u channels, stream %d channels",
199199
config->number_of_responses, config->channels_in_config, nch);
200200

201201
/* Sanity checks */

‎src/audio/eq_iir/eq_iir_ipc3.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ static int eq_iir_verify_params(struct comp_dev *dev,
291291

292292
ret = comp_verify_params(dev, buffer_flag, params);
293293
if (ret < 0) {
294-
comp_err(dev, "eq_iir_verify_params(): comp_verify_params() failed.");
294+
comp_err(dev, "comp_verify_params() failed.");
295295
return ret;
296296
}
297297

‎src/audio/eq_iir/eq_iir_ipc4.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static eq_iir_func eq_iir_find_func(struct processing_module *mod)
5757
{
5858
unsigned int valid_bit_depth = mod->priv.cfg.base_cfg.audio_fmt.valid_bit_depth;
5959

60-
comp_dbg(mod->dev, "eq_iir_find_func(): valid_bit_depth %d", valid_bit_depth);
60+
comp_dbg(mod->dev, "valid_bit_depth %d", valid_bit_depth);
6161
switch (valid_bit_depth) {
6262
#if CONFIG_FORMAT_S16LE
6363
case IPC4_DEPTH_16BIT:

‎src/audio/google/google_ctc_audio_processing.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ static int ctc_init(struct processing_module *mod)
267267
/* Create private component data */
268268
cd = rzalloc(SOF_MEM_FLAG_USER, sizeof(*cd));
269269
if (!cd) {
270-
comp_err(dev, "ctc_init(): Failed to create component data");
270+
comp_err(dev, "Failed to create component data");
271271
ctc_free(mod);
272272
return -ENOMEM;
273273
}
@@ -279,27 +279,27 @@ static int ctc_init(struct processing_module *mod)
279279

280280
cd->input = rballoc(SOF_MEM_FLAG_USER, buf_size);
281281
if (!cd->input) {
282-
comp_err(dev, "ctc_init(): Failed to allocate input buffer");
282+
comp_err(dev, "Failed to allocate input buffer");
283283
ctc_free(mod);
284284
return -ENOMEM;
285285
}
286286
cd->output = rballoc(SOF_MEM_FLAG_USER, buf_size);
287287
if (!cd->output) {
288-
comp_err(dev, "ctc_init(): Failed to allocate output buffer");
288+
comp_err(dev, "Failed to allocate output buffer");
289289
ctc_free(mod);
290290
return -ENOMEM;
291291
}
292292

293293
cd->tuning_handler = comp_data_blob_handler_new(dev);
294294
if (!cd->tuning_handler) {
295-
comp_err(dev, "ctc_init(): Failed to create tuning handler");
295+
comp_err(dev, "Failed to create tuning handler");
296296
ctc_free(mod);
297297
return -ENOMEM;
298298
}
299299

300300
cd->enabled = true;
301301

302-
comp_dbg(dev, "ctc_init(): Ready");
302+
comp_dbg(dev, "Ready");
303303

304304
return 0;
305305
}
@@ -321,16 +321,16 @@ static int google_ctc_audio_processing_reconfigure(struct processing_module *mod
321321
}
322322

323323
if (!config) {
324-
comp_err(dev, "google_ctc_audio_processing_reconfigure(): Tuning config not set");
324+
comp_err(dev, "Tuning config not set");
325325
return -EINVAL;
326326
}
327327

328-
comp_info(dev, "google_ctc_audio_processing_reconfigure(): New tuning config %p (%zu bytes)",
328+
comp_info(dev, "New tuning config %p (%zu bytes)",
329329
config, size);
330330

331331
cd->reconfigure = false;
332332
comp_info(dev,
333-
"google_ctc_audio_processing_reconfigure(): Applying config of size %zu bytes",
333+
"Applying config of size %zu bytes",
334334
size);
335335
ret = GoogleCtcAudioProcessingReconfigure(cd->state, config, size);
336336
if (ret) {
@@ -391,7 +391,7 @@ static int ctc_prepare(struct processing_module *mod,
391391
config = comp_get_data_blob(cd->tuning_handler, &config_size, NULL);
392392

393393
if (config_size != CTC_BLOB_CONFIG_SIZE) {
394-
comp_info(mod->dev, "ctc_prepare(): config_size not expected: %d", config_size);
394+
comp_info(mod->dev, "config_size not expected: %d", config_size);
395395
config = NULL;
396396
config_size = 0;
397397
}

‎src/audio/google/google_ctc_audio_processing_ipc3.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ int ctc_set_config(struct processing_module *mod, uint32_t param_id,
4040
config = comp_get_data_blob(cd->tuning_handler, &size, NULL);
4141
if (size != CTC_BLOB_CONFIG_SIZE) {
4242
comp_err(mod->dev,
43-
"ctc_set_config(): Invalid config size = %d",
43+
"Invalid config size = %d",
4444
size);
4545
return -EINVAL;
4646
}
4747
if (config->size != CTC_BLOB_CONFIG_SIZE) {
4848
comp_err(mod->dev,
49-
"ctc_set_config(): Invalid config->size = %d",
49+
"Invalid config->size = %d",
5050
config->size);
5151
return -EINVAL;
5252
}
@@ -61,12 +61,12 @@ int ctc_set_config(struct processing_module *mod, uint32_t param_id,
6161
return 0;
6262
}
6363
comp_err(mod->dev,
64-
"ctc_set_config(): Illegal num_elems = %d",
64+
"Illegal num_elems = %d",
6565
cdata->num_elems);
6666
return -EINVAL;
6767
default:
6868
comp_err(mod->dev,
69-
"ctc_set_config(): Only binary and switch controls supported %d",
69+
"Only binary and switch controls supported %d",
7070
cdata->cmd);
7171
return -EINVAL;
7272
}
@@ -79,7 +79,7 @@ int ctc_get_config(struct processing_module *mod,
7979
struct sof_ipc_ctrl_data *cdata = (struct sof_ipc_ctrl_data *)fragment;
8080
struct google_ctc_audio_processing_comp_data *cd = module_get_private_data(mod);
8181

82-
comp_info(mod->dev, "ctc_get_config(): %u", cdata->cmd);
82+
comp_info(mod->dev, "%u", cdata->cmd);
8383

8484
switch (cdata->cmd) {
8585
case SOF_CTRL_CMD_BINARY:

‎src/audio/google/google_ctc_audio_processing_ipc4.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ int ctc_set_config(struct processing_module *mod, uint32_t param_id,
3737
case SOF_IPC4_SWITCH_CONTROL_PARAM_ID:
3838
if (ctl->id == 0 && ctl->num_elems == 1) {
3939
cd->enabled = ctl->chanv[0].value;
40-
comp_info(mod->dev, "ctc_set_config(): enabled = %d", cd->enabled);
40+
comp_info(mod->dev, "enabled = %d", cd->enabled);
4141
return 0;
4242
}
43-
comp_err(mod->dev, "ctc_set_config(): Illegal control id = %d, num_elems = %d",
43+
comp_err(mod->dev, "Illegal control id = %d, num_elems = %d",
4444
ctl->id, ctl->num_elems);
4545
return -EINVAL;
4646
case SOF_IPC4_ENUM_CONTROL_PARAM_ID:
4747
default:
48-
comp_err(mod->dev, "ctc_set_config(): Only binary and switch controls supported");
48+
comp_err(mod->dev, "Only binary and switch controls supported");
4949
return -EINVAL;
5050
}
5151

@@ -58,13 +58,13 @@ int ctc_set_config(struct processing_module *mod, uint32_t param_id,
5858
config = comp_get_data_blob(cd->tuning_handler, &size, NULL);
5959
if (size != CTC_BLOB_CONFIG_SIZE) {
6060
comp_err(mod->dev,
61-
"ctc_set_config(): Invalid config size = %d",
61+
"Invalid config size = %d",
6262
size);
6363
return -EINVAL;
6464
}
6565
if (config->size != CTC_BLOB_CONFIG_SIZE) {
6666
comp_err(mod->dev,
67-
"ctc_set_config(): Invalid config->size = %d",
67+
"Invalid config->size = %d",
6868
config->size);
6969
return -EINVAL;
7070
}
@@ -81,7 +81,7 @@ int ctc_get_config(struct processing_module *mod,
8181
struct sof_ipc_ctrl_data *cdata = (struct sof_ipc_ctrl_data *)fragment;
8282
struct google_ctc_audio_processing_comp_data *cd = module_get_private_data(mod);
8383

84-
comp_info(mod->dev, "ctc_get_config(): %u", cdata->cmd);
84+
comp_info(mod->dev, "%u", cdata->cmd);
8585

8686
return comp_data_blob_get_cmd(cd->tuning_handler, cdata, fragment_size);
8787
}

‎src/audio/google/google_hotword_detect.c‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,19 @@ static struct comp_dev *ghd_create(const struct comp_driver *drv,
115115

116116
cd->msg = ipc_msg_init(cd->event.rhdr.hdr.cmd, cd->event.rhdr.hdr.size);
117117
if (!cd->msg) {
118-
comp_err(dev, "ghd_create(): ipc_msg_init failed");
118+
comp_err(dev, "ipc_msg_init failed");
119119
goto cd_fail;
120120
}
121121

122122
/* Create component model data handler */
123123
cd->model_handler = comp_data_blob_handler_new(dev);
124124
if (!cd->model_handler) {
125-
comp_err(dev, "ghd_create(): comp_data_blob_handler_new failed");
125+
comp_err(dev, "comp_data_blob_handler_new failed");
126126
goto cd_fail;
127127
}
128128

129129
dev->state = COMP_STATE_READY;
130-
comp_dbg(dev, "ghd_create(): Ready");
130+
comp_dbg(dev, "Ready");
131131
return dev;
132132

133133
cd_fail:
@@ -164,21 +164,21 @@ static int ghd_params(struct comp_dev *dev,
164164

165165
ret = comp_verify_params(dev, 0, params);
166166
if (ret < 0) {
167-
comp_err(dev, "ghd_params(): comp_verify_params failed.");
167+
comp_err(dev, "comp_verify_params failed.");
168168
return -EINVAL;
169169
}
170170

171171
/* This detector component will only ever have 1 source */
172172
sourceb = comp_dev_get_first_data_producer(dev);
173173

174174
if (audio_stream_get_channels(sourceb->stream) != 1) {
175-
comp_err(dev, "ghd_params(): Only single-channel supported");
175+
comp_err(dev, "Only single-channel supported");
176176
ret = -EINVAL;
177177
} else if (audio_stream_get_frm_fmt(&sourceb->stream) != SOF_IPC_FRAME_S16_LE) {
178-
comp_err(dev, "ghd_params(): Only S16_LE supported");
178+
comp_err(dev, "Only S16_LE supported");
179179
ret = -EINVAL;
180180
} else if (sourceb->stream.rate != KPB_SAMPLNG_FREQUENCY) {
181-
comp_err(dev, "ghd_params(): Only 16KHz supported");
181+
comp_err(dev, "Only 16KHz supported");
182182
ret = -EINVAL;
183183
}
184184

@@ -229,11 +229,11 @@ static int ghd_ctrl_set_bin_data(struct comp_dev *dev,
229229
switch (cdata->data->type) {
230230
case GOOGLE_HOTWORD_DETECT_MODEL:
231231
ret = comp_data_blob_set_cmd(cd->model_handler, cdata);
232-
comp_dbg(dev, "ghd_ctrl_set_bin_data(): comp_data_blob_set_cmd=%d",
232+
comp_dbg(dev, "comp_data_blob_set_cmd=%d",
233233
ret);
234234
return ret;
235235
default:
236-
comp_err(dev, "ghd_ctrl_set_bin_data(): Unknown cdata->data->type %d",
236+
comp_err(dev, "Unknown cdata->data->type %d",
237237
cdata->data->type);
238238
return -EINVAL;
239239
}
@@ -246,7 +246,7 @@ static int ghd_ctrl_set_data(struct comp_dev *dev,
246246
case SOF_CTRL_CMD_BINARY:
247247
return ghd_ctrl_set_bin_data(dev, cdata);
248248
default:
249-
comp_err(dev, "ghd_ctrl_set_data(): Only binary controls supported %d",
249+
comp_err(dev, "Only binary controls supported %d",
250250
cdata->cmd);
251251
return -EINVAL;
252252
}
@@ -264,11 +264,11 @@ static int ghd_ctrl_get_bin_data(struct comp_dev *dev,
264264
ret = comp_data_blob_get_cmd(cd->model_handler,
265265
cdata,
266266
max_data_size);
267-
comp_dbg(dev, "ghd_ctrl_get_bin_data(): comp_data_blob_get_cmd=%d, size=%d",
267+
comp_dbg(dev, "comp_data_blob_get_cmd=%d, size=%d",
268268
ret, max_data_size);
269269
return ret;
270270
default:
271-
comp_err(dev, "ghd_ctrl_get_bin_data(): Unknown cdata->data->type %d",
271+
comp_err(dev, "Unknown cdata->data->type %d",
272272
cdata->data->type);
273273
return -EINVAL;
274274
}
@@ -282,7 +282,7 @@ static int ghd_ctrl_get_data(struct comp_dev *dev,
282282
case SOF_CTRL_CMD_BINARY:
283283
return ghd_ctrl_get_bin_data(dev, cdata, max_data_size);
284284
default:
285-
comp_err(dev, "ghd_ctrl_get_data(): Only binary controls supported %d",
285+
comp_err(dev, "Only binary controls supported %d",
286286
cdata->cmd);
287287
return -EINVAL;
288288
}
@@ -293,15 +293,15 @@ static int ghd_cmd(struct comp_dev *dev, int cmd, void *data,
293293
{
294294
struct sof_ipc_ctrl_data *cdata = data;
295295

296-
comp_dbg(dev, "ghd_cmd(): %d", cmd);
296+
comp_dbg(dev, "%d", cmd);
297297

298298
switch (cmd) {
299299
case COMP_CMD_SET_DATA:
300300
return ghd_ctrl_set_data(dev, cdata);
301301
case COMP_CMD_GET_DATA:
302302
return ghd_ctrl_get_data(dev, cdata, max_data_size);
303303
default:
304-
comp_err(dev, "ghd_cmd(): Unknown cmd %d", cmd);
304+
comp_err(dev, "Unknown cmd %d", cmd);
305305
return -EINVAL;
306306
}
307307
}
@@ -311,7 +311,7 @@ static int ghd_trigger(struct comp_dev *dev, int cmd)
311311
{
312312
struct comp_data *cd = comp_get_drvdata(dev);
313313

314-
comp_dbg(dev, "ghd_trigger(): %d", cmd);
314+
comp_dbg(dev, "%d", cmd);
315315

316316
if (cmd == COMP_TRIGGER_START || cmd == COMP_TRIGGER_RELEASE) {
317317
cd->detected = 0;
@@ -382,7 +382,7 @@ static int ghd_copy(struct comp_dev *dev)
382382

383383
/* Check for new model */
384384
if (comp_is_new_data_blob_available(cd->model_handler)) {
385-
comp_dbg(dev, "ghd_copy(): Switch to new model");
385+
comp_dbg(dev, "Switch to new model");
386386
ret = ghd_setup_model(dev);
387387
if (ret)
388388
return ret;

0 commit comments

Comments
 (0)