Unverified Commit 4fd0f664 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda-loader-skl: Use the basefw firmware container directly 



Switch to access to the firmware struct via sdev->basefw container to
unblock the removal of the firmware information from plat_data.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarChao Song <chao.song@intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20221020121238.18339-6-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/intel/hda-loader-skl.c

+3 −4
Original line number Diff line number Diff line
@@ -494,14 +494,13 @@ static int cl_copy_fw_skl(struct snd_sof_dev *sdev, 
			  struct snd_dma_buffer *dmab)



{

	struct snd_sof_pdata *plat_data = sdev->pdata;

	const struct firmware *fw =  plat_data->fw;

	const struct firmware *fw =  sdev->basefw.fw;

	struct firmware stripped_firmware;

	unsigned int bufsize = HDA_SKL_CLDMA_MAX_BUFFER_SIZE;

	int ret;



	stripped_firmware.data = plat_data->fw->data + plat_data->fw_offset;

	stripped_firmware.size = plat_data->fw->size - plat_data->fw_offset;

	stripped_firmware.data = fw->data + sdev->basefw.payload_offset;

	stripped_firmware.size = fw->size - sdev->basefw.payload_offset;



	dev_dbg(sdev->dev, "firmware size: %#zx buffer size %#x\n", fw->size, bufsize);