audio: remove function names from logging calls (4/8)

Remove verbatim function names for aria, dcblock, smart_amp, copier,
selector.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

src/audio/aria/aria.c

@@ -139,7 +139,7 @@ static int aria_init(struct processing_module *mod)
 	att = aria->attenuation;
 
 	if (aria->attenuation > ARIA_MAX_ATT) {
-		comp_warn(dev, "init_aria(): Attenuation value %d must not be greater than %d",
+		comp_warn(dev, "Attenuation value %d must not be greater than %d",
 			  att, ARIA_MAX_ATT);
 		att = ARIA_MAX_ATT;
 	}
@@ -149,7 +149,7 @@ static int aria_init(struct processing_module *mod)
 
 	if (!buf) {
 		rfree(cd);
-		comp_err(dev, "init_aria(): allocation failed for size %d", req_mem);
+		comp_err(dev, "allocation failed for size %d", req_mem);
 		return -ENOMEM;
 	}
 
@@ -201,12 +201,12 @@ static int aria_prepare(struct processing_module *mod,
 
 	if (audio_stream_get_valid_fmt(&source->stream) != SOF_IPC_FRAME_S24_4LE ||
 	    audio_stream_get_valid_fmt(&sink->stream) != SOF_IPC_FRAME_S24_4LE) {
-		comp_err(dev, "aria_prepare(): format is not supported");
+		comp_err(dev, "format is not supported");
 		return -EINVAL;
 	}
 
 	if (dev->state == COMP_STATE_ACTIVE) {
-		comp_info(dev, "aria_prepare(): Component is in active state.");
+		comp_info(dev, "Component is in active state.");
 		return 0;
 	}
 
@@ -291,7 +291,7 @@ static int aria_set_config(struct processing_module *mod, uint32_t param_id,
 		memcpy_s(&cd->att, sizeof(uint32_t), fragment, sizeof(uint32_t));
 		if (cd->att > ARIA_MAX_ATT) {
 			comp_warn(dev,
-				  "aria_set_config(): Attenuation parameter %d is limited to %d",
+				  "Attenuation parameter %d is limited to %d",
 				  cd->att, ARIA_MAX_ATT);
 			cd->att = ARIA_MAX_ATT;
 		}

src/audio/copier/copier_ipcgtw.c

@@ -102,7 +102,7 @@ int copier_ipcgtw_process(const struct ipc4_ipcgtw_cmd *cmd,
 	if (!dev)
 		return -ENODEV;
 
-	comp_dbg(dev, "copier_ipcgtw_process(): %x %x",
+	comp_dbg(dev, "%x %x",
 		 cmd->primary.dat, cmd->extension.dat);
 
 	buf = get_buffer(dev);
@@ -113,7 +113,7 @@ int copier_ipcgtw_process(const struct ipc4_ipcgtw_cmd *cmd,
 		 * case do not report error but return 0 bytes available for GET_DATA and
 		 * 0 bytes free for SET_DATA.
 		 */
-		comp_warn(dev, "copier_ipcgtw_process(): no buffer found");
+		comp_warn(dev, "no buffer found");
 	}
 
 	out = (struct ipc4_ipc_gateway_cmd_data_reply *)reply_payload;
@@ -162,7 +162,7 @@ int copier_ipcgtw_process(const struct ipc4_ipcgtw_cmd *cmd,
 		break;
 
 	default:
-		comp_err(dev, "copier_ipcgtw_process(): unexpected cmd: %u",
+		comp_err(dev, "unexpected cmd: %u",
 			 (unsigned int)cmd->primary.r.cmd);
 		return -EINVAL;
 	}
@@ -180,15 +180,15 @@ int copier_ipcgtw_params(struct ipcgtw_data *ipcgtw_data, struct comp_dev *dev,
 
 	buf = get_buffer(dev);
 	if (!buf) {
-		comp_err(dev, "ipcgtw_params(): no buffer found");
+		comp_err(dev, "no buffer found");
 		return -EINVAL;
 	}
 
 	/* resize buffer to size specified in IPC gateway config blob */
 	err = buffer_set_size(buf, ipcgtw_data->buf_size, 0);
 
 	if (err < 0) {
-		comp_err(dev, "ipcgtw_params(): failed to resize buffer to %u bytes",
+		comp_err(dev, "failed to resize buffer to %u bytes",
 			 ipcgtw_data->buf_size);
 		return err;
 	}
@@ -203,7 +203,7 @@ void copier_ipcgtw_reset(struct comp_dev *dev)
 	if (buf) {
 		audio_stream_reset(&buf->stream);
 	} else {
-		comp_warn(dev, "ipcgtw_reset(): no buffer found");
+		comp_warn(dev, "no buffer found");
 	}
 }
 
@@ -221,7 +221,7 @@ __cold int copier_ipcgtw_create(struct comp_dev *dev, struct copier_data *cd,
 
 	gtw_cfg = &copier->gtw_cfg;
 	if (!gtw_cfg->config_length) {
-		comp_err(dev, "ipcgtw_create(): empty ipc4_gateway_config_data");
+		comp_err(dev, "empty ipc4_gateway_config_data");
 		return -EINVAL;
 	}
 
@@ -244,7 +244,7 @@ __cold int copier_ipcgtw_create(struct comp_dev *dev, struct copier_data *cd,
 	/* The buffer connected to the IPC gateway will be resized later in ipcgtw_params()
 	 * to the size specified in the IPC gateway blob.
 	 */
-	comp_dbg(dev, "ipcgtw_create(): buffer_size: %u", blob->buffer_size);
+	comp_dbg(dev, "buffer_size: %u", blob->buffer_size);
 	ipcgtw_data->buf_size = blob->buffer_size;
 
 	cd->converter[IPC4_COPIER_GATEWAY_PIN] =

src/audio/dcblock/dcblock.c

@@ -99,14 +99,14 @@ static int dcblock_init(struct processing_module *mod)
 	/* component model data handler */
 	cd->model_handler = comp_data_blob_handler_new(dev);
 	if (!cd->model_handler) {
-		comp_err(dev, "dcblock_init(): comp_data_blob_handler_new() failed.");
+		comp_err(dev, "comp_data_blob_handler_new() failed.");
 		ret = -ENOMEM;
 		goto err_cd;
 	}
 
 	ret = comp_init_data_blob(cd->model_handler, bs, ipc_dcblock->data);
 	if (ret < 0) {
-		comp_err(dev, "dcblock_init(): comp_init_data_blob() failed with error: %d", ret);
+		comp_err(dev, "comp_init_data_blob() failed with error: %d", ret);
 		goto err_model_cd;
 	}
 

src/audio/selector/selector.c

@@ -68,7 +68,7 @@ static int selector_verify_params(struct comp_dev *dev,
 		buffer = comp_dev_get_first_data_consumer(dev);
 		if (cd->config.in_channels_count &&
 		    cd->config.in_channels_count != params->channels) {
-			comp_err(dev, "selector_verify_params(): src in_channels_count does not match pcm channels");
+			comp_err(dev, "src in_channels_count does not match pcm channels");
 			return -EINVAL;
 		}
 		in_channels = cd->config.in_channels_count;
@@ -86,7 +86,7 @@ static int selector_verify_params(struct comp_dev *dev,
 		buffer = comp_dev_get_first_data_producer(dev);
 		if (cd->config.out_channels_count &&
 		    cd->config.out_channels_count != params->channels) {
-			comp_err(dev, "selector_verify_params(): src in_channels_count does not match pcm channels");
+			comp_err(dev, "src in_channels_count does not match pcm channels");
 			return -EINVAL;
 		}
 		out_channels = cd->config.out_channels_count;
@@ -113,7 +113,7 @@ static int selector_verify_params(struct comp_dev *dev,
 	case SEL_SOURCE_4CH:
 		break;
 	default:
-		comp_err(dev, "selector_verify_params(): in_channels = %u", in_channels);
+		comp_err(dev, "in_channels = %u", in_channels);
 		return -EINVAL;
 	}
 
@@ -125,19 +125,19 @@ static int selector_verify_params(struct comp_dev *dev,
 	case SEL_SINK_4CH:
 		/* verify proper channels for passthrough mode */
 		if (in_channels != out_channels) {
-			comp_err(dev, "selector_verify_params(): in_channels = %u, out_channels = %u"
+			comp_err(dev, "in_channels = %u, out_channels = %u"
 				 , in_channels, out_channels);
 			return -EINVAL;
 		}
 		break;
 	default:
-		comp_err(dev, "selector_verify_params(): out_channels = %u"
+		comp_err(dev, "out_channels = %u"
 			 , out_channels);
 		return -EINVAL;
 	}
 
 	if (cd->config.sel_channel > (params->channels - 1)) {
-		comp_err(dev, "selector_verify_params(): ch_idx = %u"
+		comp_err(dev, "ch_idx = %u"
 			 , cd->config.sel_channel);
 		return -EINVAL;
 	}
@@ -211,7 +211,7 @@ static int selector_params(struct comp_dev *dev,
 
 	err = selector_verify_params(dev, params);
 	if (err < 0) {
-		comp_err(dev, "selector_params(): pcm params verification failed.");
+		comp_err(dev, "pcm params verification failed.");
 		return -EINVAL;
 	}
 
@@ -244,7 +244,7 @@ static int selector_ctrl_set_data(struct comp_dev *dev,
 		cd->config.sel_channel = cfg->sel_channel;
 		break;
 	default:
-		comp_err(dev, "selector_ctrl_set_cmd(): invalid cdata->cmd = %u",
+		comp_err(dev, "invalid cdata->cmd = %u",
 			 cdata->cmd);
 		ret = -EINVAL;
 		break;
@@ -284,7 +284,7 @@ static int selector_ctrl_get_data(struct comp_dev *dev,
 		break;
 
 	default:
-		comp_err(dev, "selector_ctrl_get_data(): invalid cdata->cmd");
+		comp_err(dev, "invalid cdata->cmd");
 		ret = -EINVAL;
 		break;
 	}
@@ -322,7 +322,7 @@ static int selector_cmd(struct comp_dev *dev, int cmd, void *data,
 		comp_dbg(dev, "selector_cmd(), COMP_CMD_GET_VALUE");
 		break;
 	default:
-		comp_err(dev, "selector_cmd(): invalid command");
+		comp_err(dev, "invalid command");
 		ret = -EINVAL;
 	}
 
@@ -444,38 +444,38 @@ static int selector_prepare(struct comp_dev *dev)
 	 * proper number of channels [1] for selector to actually
 	 * reduce channel count between source and sink
 	 */
-	comp_dbg(dev, "selector_prepare(): sourceb->schannels = %u",
+	comp_dbg(dev, "sourceb->schannels = %u",
 		 audio_stream_get_channels(&sourceb->stream));
-	comp_dbg(dev, "selector_prepare(): sinkb->channels = %u",
+	comp_dbg(dev, "sinkb->channels = %u",
 		 audio_stream_get_channels(&sinkb->stream));
 
 	sink_size = audio_stream_get_size(&sinkb->stream);
 
 	if (sink_size < cd->sink_period_bytes) {
-		comp_err(dev, "selector_prepare(): sink buffer size %zu is insufficient < %d",
+		comp_err(dev, "sink buffer size %zu is insufficient < %d",
 			 sink_size, cd->sink_period_bytes);
 		ret = -ENOMEM;
 		goto err;
 	}
 
 	/* validate */
 	if (cd->sink_period_bytes == 0) {
-		comp_err(dev, "selector_prepare(): cd->sink_period_bytes = 0, dev->frames = %u",
+		comp_err(dev, "cd->sink_period_bytes = 0, dev->frames = %u",
 			 dev->frames);
 		ret = -EINVAL;
 		goto err;
 	}
 
 	if (cd->source_period_bytes == 0) {
-		comp_err(dev, "selector_prepare(): cd->source_period_bytes = 0, dev->frames = %u",
+		comp_err(dev, "cd->source_period_bytes = 0, dev->frames = %u",
 			 dev->frames);
 		ret = -EINVAL;
 		goto err;
 	}
 
 	cd->sel_func = sel_get_processing_function(dev);
 	if (!cd->sel_func) {
-		comp_err(dev, "selector_prepare(): invalid cd->sel_func, cd->source_format = %u, cd->sink_format = %u, cd->out_channels_count = %u",
+		comp_err(dev, "invalid cd->sel_func, cd->source_format = %u, cd->sink_format = %u, cd->out_channels_count = %u",
 			 cd->source_format, cd->sink_format,
 			 cd->config.out_channels_count);
 		ret = -EINVAL;
@@ -603,13 +603,13 @@ static int selector_init(struct processing_module *mod)
 
 		if (init_cfg_ext->base_cfg_ext.nb_input_pins != SEL_NUM_IN_PIN_FMTS ||
 		    init_cfg_ext->base_cfg_ext.nb_output_pins != SEL_NUM_OUT_PIN_FMTS) {
-			comp_err(mod->dev, "selector_init(): Invalid pin configuration");
+			comp_err(mod->dev, "Invalid pin configuration");
 			return -EINVAL;
 		}
 	} else if (cfg->size == base_cfg_size + bs[1]) {
 		payload_fmt = IPC4_SEL_INIT_PAYLOAD_BASE_WITH_OUT_FMT;
 	} else {
-		comp_err(mod->dev, "selector_init(): Invalid configuration size");
+		comp_err(mod->dev, "Invalid configuration size");
 		return -EINVAL;
 	}
 
@@ -696,13 +696,13 @@ static int selector_verify_params(struct processing_module *mod,
 
 	/* verify input channels */
 	if (in_channels == 0 || in_channels > SEL_SOURCE_CHANNELS_MAX) {
-		comp_err(dev, "selector_verify_params(): in_channels = %u", in_channels);
+		comp_err(dev, "in_channels = %u", in_channels);
 		return -EINVAL;
 	}
 
 	/* verify output channels */
 	if (out_channels == 0 || out_channels > SEL_SINK_CHANNELS_MAX) {
-		comp_err(dev, "selector_verify_params(): out_channels = %u", out_channels);
+		comp_err(dev, "out_channels = %u", out_channels);
 		return -EINVAL;
 	}
 
@@ -756,7 +756,7 @@ static int selector_params(struct processing_module *mod)
 
 	err = selector_verify_params(mod, params);
 	if (err < 0) {
-		comp_err(mod->dev, "selector_params(): pcm params verification failed.");
+		comp_err(mod->dev, "pcm params verification failed.");
 		return -EINVAL;
 	}
 
@@ -855,7 +855,7 @@ static int selector_prepare(struct processing_module *mod,
 	 * proper number of channels [1] for selector to actually
 	 * reduce channel count between source and sink
 	 */
-	comp_info(dev, "selector_prepare(): source sink channel = %u %u",
+	comp_info(dev, "source sink channel = %u %u",
 		  audio_stream_get_channels(&sourceb->stream),
 		  audio_stream_get_channels(&sinkb->stream));
 
@@ -865,27 +865,27 @@ static int selector_prepare(struct processing_module *mod,
 	md->mpd.out_buff_size = cd->sink_period_bytes;
 
 	if (sink_size < cd->sink_period_bytes) {
-		comp_err(dev, "selector_prepare(): sink buffer size %d is insufficient < %d",
+		comp_err(dev, "sink buffer size %d is insufficient < %d",
 			 sink_size, cd->sink_period_bytes);
 		return -ENOMEM;
 	}
 
 	/* validate */
 	if (cd->sink_period_bytes == 0) {
-		comp_err(dev, "selector_prepare(): cd->sink_period_bytes = 0, dev->frames = %u",
+		comp_err(dev, "cd->sink_period_bytes = 0, dev->frames = %u",
 			 dev->frames);
 		return -EINVAL;
 	}
 
 	if (cd->source_period_bytes == 0) {
-		comp_err(dev, "selector_prepare(): cd->source_period_bytes = 0, dev->frames = %u",
+		comp_err(dev, "cd->source_period_bytes = 0, dev->frames = %u",
 			 dev->frames);
 		return -EINVAL;
 	}
 
 	cd->sel_func = sel_get_processing_function(mod);
 	if (!cd->sel_func) {
-		comp_err(dev, "selector_prepare(): invalid cd->sel_func, cd->source_format = %u, cd->sink_format = %u, cd->out_channels_count = %u",
+		comp_err(dev, "invalid cd->sel_func, cd->source_format = %u, cd->sink_format = %u, cd->out_channels_count = %u",
 			 cd->source_format, cd->sink_format,
 			 cd->config.out_channels_count);
 		return -EINVAL;