Unverified Commit 2a51c0f8 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Drop 'header' parameter from tx_message() API 



The header parameter is not used anymore and now it can be dropped from
the parameter list of tx_message().

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220330201926.1330402-10-ranjani.sridharan@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5db8eb5b

sound/soc/sof/compress.c

+3 −5
Original line number Diff line number Diff line
@@ -147,8 +147,7 @@ static int sof_compr_free(struct snd_soc_component *component, 
	stream.comp_id = spcm->stream[cstream->direction].comp_id;



	if (spcm->prepared[cstream->direction]) {

		ret = sof_ipc_tx_message(sdev->ipc, stream.hdr.cmd,

					 &stream, sizeof(stream),

		ret = sof_ipc_tx_message(sdev->ipc, &stream, sizeof(stream),

					 &reply, sizeof(reply));

		if (!ret)

			spcm->prepared[cstream->direction] = false;
@@ -209,7 +208,7 @@ static int sof_compr_set_params(struct snd_soc_component *component, 
		snd_pcm_format_physical_width(SNDRV_PCM_FORMAT_S32) >> 3;

	pcm.params.host_period_bytes = params->buffer.fragment_size;



	ret = sof_ipc_tx_message(sdev->ipc, pcm.hdr.cmd, &pcm, sizeof(pcm),

	ret = sof_ipc_tx_message(sdev->ipc, &pcm, sizeof(pcm),

				 &ipc_params_reply, sizeof(ipc_params_reply));

	if (ret < 0) {

		dev_err(component->dev, "error ipc failed\n");
@@ -268,8 +267,7 @@ static int sof_compr_trigger(struct snd_soc_component *component, 
		break;

	}



	return sof_ipc_tx_message(sdev->ipc, stream.hdr.cmd,

				  &stream, sizeof(stream),

	return sof_ipc_tx_message(sdev->ipc, &stream, sizeof(stream),

				  &reply, sizeof(reply));

}

sound/soc/sof/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static int memory_info_update(struct snd_sof_dev *sdev, char *buf, size_t buff_s 
		goto error;

	}



	ret = sof_ipc_tx_message(sdev->ipc, msg.cmd, &msg, msg.size, reply, SOF_IPC_MSG_MAX_SIZE);

	ret = sof_ipc_tx_message(sdev->ipc, &msg, msg.size, reply, SOF_IPC_MSG_MAX_SIZE);

	pm_runtime_mark_last_busy(sdev->dev);

	pm_runtime_put_autosuspend(sdev->dev);

	if (ret < 0 || reply->rhdr.error < 0) {

sound/soc/sof/intel/hda-dsp.c

+3 −5
Original line number Diff line number Diff line
@@ -363,9 +363,8 @@ static int hda_dsp_send_pm_gate_ipc(struct snd_sof_dev *sdev, u32 flags) 
	pm_gate.flags = flags;



	/* send pm_gate ipc to dsp */

	return sof_ipc_tx_message_no_pm(sdev->ipc, pm_gate.hdr.cmd,

					&pm_gate, sizeof(pm_gate), &reply,

					sizeof(reply));

	return sof_ipc_tx_message_no_pm(sdev->ipc, &pm_gate, sizeof(pm_gate),

					&reply, sizeof(reply));

}



static int hda_dsp_update_d0i3c_register(struct snd_sof_dev *sdev, u8 value)
@@ -985,8 +984,7 @@ int hda_dsp_core_get(struct snd_sof_dev *sdev, int core) 
		return 0;



	/* Now notify DSP for secondary cores */

	ret = sof_ipc_tx_message(sdev->ipc, pm_core_config.hdr.cmd,

				 &pm_core_config, sizeof(pm_core_config),

	ret = sof_ipc_tx_message(sdev->ipc, &pm_core_config, sizeof(pm_core_config),

				 &pm_core_config, sizeof(pm_core_config));

	if (ret < 0) {

		dev_err(sdev->dev, "failed to enable secondary core '%d' failed with %d\n",

sound/soc/sof/intel/tgl.c

+2 −4
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ static int tgl_dsp_core_get(struct snd_sof_dev *sdev, int core) 
		return hda_dsp_enable_core(sdev, BIT(core));



	/* notify DSP for secondary cores */

	return sof_ipc_tx_message(sdev->ipc, pm_core_config.hdr.cmd,

				 &pm_core_config, sizeof(pm_core_config),

	return sof_ipc_tx_message(sdev->ipc, &pm_core_config, sizeof(pm_core_config),

				 &pm_core_config, sizeof(pm_core_config));

}
@@ -55,8 +54,7 @@ static int tgl_dsp_core_put(struct snd_sof_dev *sdev, int core) 
		return hda_dsp_core_reset_power_down(sdev, BIT(core));



	/* notify DSP for secondary cores */

	return sof_ipc_tx_message(sdev->ipc, pm_core_config.hdr.cmd,

				 &pm_core_config, sizeof(pm_core_config),

	return sof_ipc_tx_message(sdev->ipc, &pm_core_config, sizeof(pm_core_config),

				 &pm_core_config, sizeof(pm_core_config));

}

sound/soc/sof/ipc.c

+7 −11
Original line number Diff line number Diff line
@@ -341,9 +341,8 @@ static int sof_ipc_tx_message_unlocked(struct snd_sof_ipc *ipc, 
}



/* send IPC message from host to DSP */

int sof_ipc_tx_message(struct snd_sof_ipc *ipc, u32 header,

		       void *msg_data, size_t msg_bytes, void *reply_data,

		       size_t reply_bytes)

int sof_ipc_tx_message(struct snd_sof_ipc *ipc, void *msg_data, size_t msg_bytes,

		       void *reply_data, size_t reply_bytes)

{

	const struct sof_dsp_power_state target_state = {

		.state = SOF_DSP_PM_D0,
@@ -357,7 +356,7 @@ int sof_ipc_tx_message(struct snd_sof_ipc *ipc, u32 header, 
		return ret;

	}



	return sof_ipc_tx_message_no_pm(ipc, header, msg_data, msg_bytes,

	return sof_ipc_tx_message_no_pm(ipc, msg_data, msg_bytes,

					reply_data, reply_bytes);

}

EXPORT_SYMBOL(sof_ipc_tx_message);
@@ -367,8 +366,7 @@ EXPORT_SYMBOL(sof_ipc_tx_message); 
 * This will be used for IPC's that can be handled by the DSP

 * even in a low-power D0 substate.

 */

int sof_ipc_tx_message_no_pm(struct snd_sof_ipc *ipc, u32 header,

			     void *msg_data, size_t msg_bytes,

int sof_ipc_tx_message_no_pm(struct snd_sof_ipc *ipc, void *msg_data, size_t msg_bytes,

			     void *reply_data, size_t reply_bytes)

{

	int ret;
@@ -701,8 +699,7 @@ int snd_sof_ipc_stream_posn(struct snd_soc_component *scomp, 
	stream.comp_id = spcm->stream[direction].comp_id;



	/* send IPC to the DSP */

	err = sof_ipc_tx_message(sdev->ipc,

				 stream.hdr.cmd, &stream, sizeof(stream), posn,

	err = sof_ipc_tx_message(sdev->ipc, &stream, sizeof(stream), posn,

				 sizeof(*posn));

	if (err < 0) {

		dev_err(sdev->dev, "error: failed to get stream %d position\n",
@@ -893,9 +890,8 @@ int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol, bool set) 


	/* send normal size ipc in one part */

	if (cdata->rhdr.hdr.size <= SOF_IPC_MSG_MAX_SIZE) {

		err = sof_ipc_tx_message(sdev->ipc, cdata->rhdr.hdr.cmd, cdata,

					 cdata->rhdr.hdr.size, cdata,

					 cdata->rhdr.hdr.size);

		err = sof_ipc_tx_message(sdev->ipc, cdata, cdata->rhdr.hdr.size,

					 cdata, cdata->rhdr.hdr.size);



		if (err < 0)

			dev_err(sdev->dev, "error: set/get ctrl ipc comp %d\n",