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: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Chao Song <chao.song@intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20221020121238.18339-6-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-loader-skl.c b/sound/soc/sof/intel/hda-loader-skl.c
index 0193fb3..3211f56 100644 (file)
--- a/sound/soc/sof/intel/hda-loader-skl.c
+++ b/sound/soc/sof/intel/hda-loader-skl.c
@@ -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);