Unverified Commit 96ec1741 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: loader: load_firmware callback is mandatory, treat it like that 



Since the load_firmware callback in snd_sof_dsp_ops is mandatory and it
is tested during probe.

Move the snd_sof_load_firmware() wrapper to ops.h as inline and drop the
check of sof_ops(sdev)->load_firmware

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20210914125356.19828-1-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/loader.c

+0 −10
Original line number Diff line number Diff line
@@ -800,16 +800,6 @@ int snd_sof_load_firmware_memcpy(struct snd_sof_dev *sdev) 
}

EXPORT_SYMBOL(snd_sof_load_firmware_memcpy);



int snd_sof_load_firmware(struct snd_sof_dev *sdev)

{

	dev_dbg(sdev->dev, "loading firmware\n");



	if (sof_ops(sdev)->load_firmware)

		return sof_ops(sdev)->load_firmware(sdev);

	return 0;

}

EXPORT_SYMBOL(snd_sof_load_firmware);



int snd_sof_run_firmware(struct snd_sof_dev *sdev)

{

	int ret;

sound/soc/sof/ops.h

+8 −0
Original line number Diff line number Diff line
@@ -400,6 +400,14 @@ snd_sof_pcm_platform_trigger(struct snd_sof_dev *sdev, 
	return 0;

}



/* Firmware loading */

static inline int snd_sof_load_firmware(struct snd_sof_dev *sdev)

{

	dev_dbg(sdev->dev, "loading firmware\n");



	return sof_ops(sdev)->load_firmware(sdev);

}



/* host DSP message data */

static inline void snd_sof_ipc_msg_data(struct snd_sof_dev *sdev,

					struct snd_pcm_substream *substream,

sound/soc/sof/sof-priv.h

+0 −1
Original line number Diff line number Diff line
@@ -485,7 +485,6 @@ int snd_sof_create_page_table(struct device *dev, 
/*

 * Firmware loading.

 */

int snd_sof_load_firmware(struct snd_sof_dev *sdev);

int snd_sof_load_firmware_raw(struct snd_sof_dev *sdev);

int snd_sof_load_firmware_memcpy(struct snd_sof_dev *sdev);

int snd_sof_run_firmware(struct snd_sof_dev *sdev);